Map needs to be 32 bit (and window 32 bit)

[Skybuck]

For my color experiments I need map to be 32 bit surface and ofcourse window/screen also 32 bit.

I tried all kinds of methods, but nothing is really working so far.

If one of you guys can make this that would be great.

Currently it's just too complex to get done by me.

I will keep trying, however here is an example of a git merge:

Code: [Select]

Build started...
1>------ Build started: Project: OpenXcom, Configuration: Debug Win32 ------
1>Build started 30-5-2022 22:48:59.
1>Target InitializeBuildStatus:
1>  Touching "E:\SourceCode\OpenXCom\TryMerge\src\..\obj\Win32\Debug\OpenXcom.tlog\unsuccessfulbuild".
1>Target VcpkgTripletSelection:
1>  Using triplet "x86-windows" from "E:\SourceCode\vcpkg\scripts\buildsystems\msbuild\..\..\..\installed\x86-windows\"
1>Target ClCompile:
1>  Map.cpp
1>  PathfindingOpenSet.cpp
1>  PrimeGrenadeState.cpp
1>  Projectile.cpp
1>  ProjectileFlyBState.cpp
1>  PromotionsState.cpp
1>  PsiAttackBState.cpp
1>  ScannerState.cpp
1>  ScannerView.cpp
1>  TileEngine.cpp
1>  UnitDieBState.cpp
1>  UnitFallBState.cpp
1>  UnitInfoState.cpp
1>  UnitPanicBState.cpp
1>  UnitSprite.cpp
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,42): error C2065: 'Pixel': undeclared identifier (compiling source file Battlescape\UnitSprite.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,29): error C2923: 'OpenXcom::helper::CorrectConst': 'Pixel' is not a valid template type argument for parameter 'Pixel' (compiling source file Battlescape\UnitSprite.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216): message : see declaration of 'Pixel' (compiling source file Battlescape\UnitSprite.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,50): error C2955: 'OpenXcom::helper::CorrectConst': use of class template requires template argument list (compiling source file Battlescape\UnitSprite.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(59): message : see declaration of 'OpenXcom::helper::CorrectConst' (compiling source file Battlescape\UnitSprite.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(222,55): error C2065: 'Pixel': undeclared identifier (compiling source file Battlescape\UnitSprite.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(120,4): error C2065: 'dest': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(121,4): error C2562: 'OpenXcom::`anonymous-namespace'::ColorReplace::func': 'void' function returning a value
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(115): message : see declaration of 'OpenXcom::`anonymous-namespace'::ColorReplace::func'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(125,4): error C2562: 'OpenXcom::`anonymous-namespace'::ColorReplace::func': 'void' function returning a value
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(115): message : see declaration of 'OpenXcom::`anonymous-namespace'::ColorReplace::func'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(135,9): error C3861: 'loop': identifier not found
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(316,24): error C2653: 'ColorFace': is not a class or namespace name
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(316,35): error C2065: 'Face': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(317,24): error C2653: 'ColorFace': is not a class or namespace name
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(317,35): error C2065: 'Hair': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(334,16): error C2065: 'ColorFace': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(334,5): error C2672: 'ShaderDraw': no matching overloaded function found
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(334,99): error C2974: 'OpenXcom::ShaderDraw': invalid template argument for 'ColorFunc', type expected
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDraw.h(454): message : see declaration of 'OpenXcom::ShaderDraw'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(623,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine1': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(213): message : this line contains a '{' which has not yet been matched
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(782,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine2': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(213): message : this line contains a '{' which has not yet been matched
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(834,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine3': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(213): message : this line contains a '{' which has not yet been matched
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(880,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine4': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(213): message : this line contains a '{' which has not yet been matched
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1021,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine5': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(213): message : this line contains a '{' which has not yet been matched
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1050,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine6': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(213): message : this line contains a '{' which has not yet been matched
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1246,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine7': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(213): message : this line contains a '{' which has not yet been matched
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1320,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine8': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(213): message : this line contains a '{' which has not yet been matched
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1353,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine9': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(213): message : this line contains a '{' which has not yet been matched
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1382,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine11': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(213): message : this line contains a '{' which has not yet been matched
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1426,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine12': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(213): message : this line contains a '{' which has not yet been matched
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1453,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine19': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(213): message : this line contains a '{' which has not yet been matched
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1485,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine20': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(213): message : this line contains a '{' which has not yet been matched
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1511,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine21': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(213): message : this line contains a '{' which has not yet been matched
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1531,18): error C2601: 'OpenXcom::UnitSprite::sortRifles': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(213): message : this line contains a '{' which has not yet been matched
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(32): fatal error C1075: '{': no matching token found
1>  UnitTurnBState.cpp
1>  UnitWalkBState.cpp
1>  WarningMessage.cpp
1>  Action.cpp
1>  AdlibMusic.cpp
1>  adlplayer.cpp
1>  fmopl.cpp
1>  CatFile.cpp
1>  CrossPlatform.cpp
1>  FastLineClip.cpp
1>  FileMap.cpp
1>  FlcPlayer.cpp
1>  Font.cpp
1>  GMCat.cpp
1>  Game.cpp
1>  InteractiveSurface.cpp
1>  Language.cpp
1>  LanguagePlurality.cpp
1>  LocalizedText.cpp
1>  ModInfo.cpp
1>  Music.cpp
1>  OpenGL.cpp
1>  OptionInfo.cpp
1>  Options.cpp
1>  Palette.cpp
1>  RNG.cpp
1>  hq2x.cpp
1>  hq3x.cpp
1>  hq4x.cpp
1>  init.cpp
1>  scale2x.cpp
1>  scale3x.cpp
1>  scalebit.cpp
1>  xbrz.cpp
1>  Screen.cpp
1>  Sound.cpp
1>  SoundSet.cpp
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,42): error C2065: 'Pixel': undeclared identifier (compiling source file Engine\Screen.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,29): error C2923: 'OpenXcom::helper::CorrectConst': 'Pixel' is not a valid template type argument for parameter 'Pixel' (compiling source file Engine\Screen.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216): message : see declaration of 'Pixel' (compiling source file Engine\Screen.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,50): error C2955: 'OpenXcom::helper::CorrectConst': use of class template requires template

[Skybuck]

Part 2:

Code: [Select]

argument list (compiling source file Engine\Screen.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(59): message : see declaration of 'OpenXcom::helper::CorrectConst' (compiling source file Engine\Screen.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(222,55): error C2065: 'Pixel': undeclared identifier (compiling source file Engine\Screen.cpp)
1>  State.cpp
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(209,7): error C3861: 'isOpenGLEnabled': identifier not found
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(477,1): error C2059: syntax error: '}'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(668,1): error C2059: syntax error: '}'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(319,2): error C2059: syntax error: 'if'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(322,1): error C2143: syntax error: missing ';' before '{'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(322,1): error C2143: syntax error: missing ')' before ';'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(477,1): error C2059: syntax error: ')'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(483,16): error C2601: 'OpenXcom::Screen::getXScale': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(492,16): error C2601: 'OpenXcom::Screen::getYScale': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(501,13): error C2601: 'OpenXcom::Screen::getCursorTopBlackBand': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(510,13): error C2601: 'OpenXcom::Screen::getCursorLeftBlackBand': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(519,14): error C2601: 'OpenXcom::Screen::screenshot': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(554,14): error C2601: 'OpenXcom::Screen::use32bitScaler': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(585,14): error C2601: 'OpenXcom::Screen::useOpenGL': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(598,13): error C2601: 'OpenXcom::Screen::getDX': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(607,13): error C2601: 'OpenXcom::Screen::getDY': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(619,14): error C2601: 'OpenXcom::Screen::updateScale': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(669,1): fatal error C1004: unexpected end-of-file found
1>  Surface.cpp
1>  SurfaceSet.cpp
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,42): error C2065: 'Pixel': undeclared identifier (compiling source file Engine\Surface.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,29): error C2923: 'OpenXcom::helper::CorrectConst': 'Pixel' is not a valid template type argument for parameter 'Pixel' (compiling source file Engine\Surface.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216): message : see declaration of 'Pixel' (compiling source file Engine\Surface.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,50): error C2955: 'OpenXcom::helper::CorrectConst': use of class template requires template argument list (compiling source file Engine\Surface.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(59): message : see declaration of 'OpenXcom::helper::CorrectConst' (compiling source file Engine\Surface.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(222,55): error C2065: 'Pixel': undeclared identifier (compiling source file Engine\Surface.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(127,2): error C3861: 'assert': identifier not found
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1062,15): error C2065: 'StandartShade': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1062,4): error C2672: 'ShaderDraw': no matching overloaded function found
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1062,84): error C2974: 'OpenXcom::ShaderDraw': invalid template argument for 'ColorFunc', type expected
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDraw.h(454): message : see declaration of 'OpenXcom::ShaderDraw'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1086,16): error C2065: 'StandartShade': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1086,5): error C2672: 'ShaderDraw': no matching overloaded function found
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1086,77): error C2974: 'OpenXcom::ShaderDraw': invalid template argument for 'ColorFunc', type expected
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDraw.h(454): message : see declaration of 'OpenXcom::ShaderDraw'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1088,16): error C2065: 'StandartShade': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1088,5): error C2672: 'ShaderDraw': no matching overloaded function found
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1088,119): error C2974: 'OpenXcom::ShaderDraw': invalid template argument for 'ColorFunc', type expected
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDraw.h(454): message : see declaration of 'OpenXcom::ShaderDraw'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1188,2): error C2065: '_tftdMode': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1197,9): error C2065: '_tftdMode': undeclared identifier
1>  Timer.cpp
1>  Unicode.cpp
1>  Zoom.cpp
1>  AlienBaseState.cpp
1>  AllocatePsiTrainingState.cpp
1>  BaseDefenseState.cpp
1>  BaseDestroyedState.cpp
1>  BaseNameState.cpp
1>  BuildNewBaseState.cpp
1>  ConfirmCydoniaState.cpp


[Skybuck]

Part 3:

Code: [Select]

1>  ConfirmDestinationState.cpp
1>  ConfirmLandingState.cpp
1>  ConfirmNewBaseState.cpp
1>  CraftErrorState.cpp
1>  CraftPatrolState.cpp
1>  DogfightErrorState.cpp
1>  DogfightState.cpp
1>  FundingState.cpp
1>  GeoscapeCraftState.cpp
1>  GeoscapeState.cpp
1>  Globe.cpp
1>  GraphsState.cpp
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,42): error C2065: 'Pixel': undeclared identifier (compiling source file Geoscape\Globe.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,29): error C2923: 'OpenXcom::helper::CorrectConst': 'Pixel' is not a valid template type argument for parameter 'Pixel' (compiling source file Geoscape\Globe.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216): message : see declaration of 'Pixel' (compiling source file Geoscape\Globe.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,50): error C2955: 'OpenXcom::helper::CorrectConst': use of class template requires template argument list (compiling source file Geoscape\Globe.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(59): message : see declaration of 'OpenXcom::helper::CorrectConst' (compiling source file Geoscape\Globe.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(222,55): error C2065: 'Pixel': undeclared identifier (compiling source file Geoscape\Globe.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Geoscape\Globe.cpp(245,1): error C2660: 'OpenXcom::`anonymous-namespace'::CreateShadow::getShadowValue': function does not take 4 arguments
1>  E:\SourceCode\OpenXCom\TryMerge\src\Geoscape\Globe.cpp(176,22): message : see declaration of 'OpenXcom::`anonymous-namespace'::CreateShadow::getShadowValue'
1>  InterceptState.cpp
1>  ItemsArrivingState.cpp
1>  LowFuelState.cpp
1>  MissionDetectedState.cpp
1>  MonthlyReportState.cpp
1>  MultipleTargetsState.cpp
1>  NewPossibleManufactureState.cpp
1>  NewPossibleResearchState.cpp
1>  ProductionCompleteState.cpp
1>  PsiTrainingState.cpp
1>  ResearchCompleteState.cpp
1>  ResearchRequiredState.cpp
1>  SelectDestinationState.cpp
1>  TargetInfoState.cpp
1>  UfoDetectedState.cpp
1>  UfoLostState.cpp
1>  ArrowButton.cpp
1>
1>  Done building project "OpenXcom.2010.vcxproj" -- FAILED.
1>
1>  Build FAILED.
1>
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,42): error C2065: 'Pixel': undeclared identifier (compiling source file Battlescape\UnitSprite.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,29): error C2923: 'OpenXcom::helper::CorrectConst': 'Pixel' is not a valid template type argument for parameter 'Pixel' (compiling source file Battlescape\UnitSprite.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,50): error C2955: 'OpenXcom::helper::CorrectConst': use of class template requires template argument list (compiling source file Battlescape\UnitSprite.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(222,55): error C2065: 'Pixel': undeclared identifier (compiling source file Battlescape\UnitSprite.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(120,4): error C2065: 'dest': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(121,4): error C2562: 'OpenXcom::`anonymous-namespace'::ColorReplace::func': 'void' function returning a value
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(125,4): error C2562: 'OpenXcom::`anonymous-namespace'::ColorReplace::func': 'void' function returning a value
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(135,9): error C3861: 'loop': identifier not found
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(316,24): error C2653: 'ColorFace': is not a class or namespace name
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(316,35): error C2065: 'Face': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(317,24): error C2653: 'ColorFace': is not a class or namespace name
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(317,35): error C2065: 'Hair': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(334,16): error C2065: 'ColorFace': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(334,5): error C2672: 'ShaderDraw': no matching overloaded function found
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(334,99): error C2974: 'OpenXcom::ShaderDraw': invalid template argument for 'ColorFunc', type expected
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(623,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine1': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(782,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine2': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(834,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine3': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(880,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine4': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1021,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine5': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1050,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine6': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1246,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine7': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1320,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine8': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1353,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine9': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1382,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine11': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1426,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine12': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1453,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine19': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1485,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine20': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1511,18): error C2601: 'OpenXcom::UnitSprite::drawRoutine21': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(1531,18): error C2601: 'OpenXcom::UnitSprite::sortRifles': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Battlescape\UnitSprite.cpp(32): fatal error C1075: '{': no matching token found
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,42): error C2065: 'Pixel': undeclared identifier (compiling source file Engine\Screen.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,29): error C2923: 'OpenXcom::helper::CorrectConst': 'Pixel' is not a valid template type argument for parameter 'Pixel' (compiling source file Engine\Screen.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,50): error C2955: 'OpenXcom::helper::CorrectConst': use of class template requires template argument list (compiling source file Engine\Screen.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(222,55): error C2065: 'Pixel': undeclared identifier (compiling source file Engine\Screen.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(209,7): error C3861: 'isOpenGLEnabled': identifier not found
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(477,1): error C2059: syntax error: '}'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(668,1): error C2059: syntax error: '}'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(319,2): error C2059: syntax error: 'if'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(322,1): error C2143: syntax error: missing ';' before '{'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(322,1): error C2143: syntax error: missing ')' before ';'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(477,1): error C2059: syntax error: ')'
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(483,16): error C2601: 'OpenXcom::Screen::getXScale': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(492,16): error C2601: 'OpenXcom::Screen::getYScale': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(501,13): error C2601: 'OpenXcom::Screen::getCursorTopBlackBand': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(510,13): error C2601: 'OpenXcom::Screen::getCursorLeftBlackBand': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(519,14): error C2601: 'OpenXcom::Screen::screenshot': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(554,14): error C2601: 'OpenXcom::Screen::use32bitScaler': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(585,14): error C2601: 'OpenXcom::Screen::useOpenGL': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(598,13): error C2601: 'OpenXcom::Screen::getDX': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(607,13): error C2601: 'OpenXcom::Screen::getDY': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(619,14): error C2601: 'OpenXcom::Screen::updateScale': local function definitions are illegal
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Screen.cpp(669,1): fatal error C1004: unexpected end-of-file found
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,42): error C2065: 'Pixel': undeclared identifier (compiling source file Engine\Surface.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,29): error C2923: 'OpenXcom::helper::CorrectConst': 'Pixel' is not a valid template type argument for parameter 'Pixel' (compiling source file Engine\Surface.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,50): error C2955: 'OpenXcom::helper::CorrectConst': use of class template requires template argument list (compiling source file Engine\Surface.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(222,55): error C2065: 'Pixel': undeclared identifier (compiling source file Engine\Surface.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(127,2): error C3861: 'assert': identifier not found
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1062,15): error C2065: 'StandartShade': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1062,4): error C2672: 'ShaderDraw': no matching overloaded function found
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1062,84): error C2974: 'OpenXcom::ShaderDraw': invalid template argument for 'ColorFunc', type expected
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1086,16): error C2065: 'StandartShade': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1086,5): error C2672: 'ShaderDraw': no matching overloaded function found
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1086,77): error C2974: 'OpenXcom::ShaderDraw': invalid template argument for 'ColorFunc', type expected
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1088,16): error C2065: 'StandartShade': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1088,5): error C2672: 'ShaderDraw': no matching overloaded function found
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1088,119): error C2974: 'OpenXcom::ShaderDraw': invalid template argument for 'ColorFunc', type expected
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1188,2): error C2065: '_tftdMode': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\Surface.cpp(1197,9): error C2065: '_tftdMode': undeclared identifier
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,42): error C2065: 'Pixel': undeclared identifier (compiling source file Geoscape\Globe.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,29): error C2923: 'OpenXcom::helper::CorrectConst': 'Pixel' is not a valid template type argument for parameter 'Pixel' (compiling source file Geoscape\Globe.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(216,50): error C2955: 'OpenXcom::helper::CorrectConst': use of class template requires template argument list (compiling source file Geoscape\Globe.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Engine\ShaderDrawHelper.h(222,55): error C2065: 'Pixel': undeclared identifier (compiling source file Geoscape\Globe.cpp)
1>  E:\SourceCode\OpenXCom\TryMerge\src\Geoscape\Globe.cpp(245,1): error C2660: 'OpenXcom::`anonymous-namespace'::CreateShadow::getShadowValue': function does not take 4 arguments
1>    0 Warning(s)
1>    74 Error(s)
1>
1>  Time Elapsed 00:01:12.46
1>A task was canceled.
1>A task was canceled.
Build has been canceled.

[Yankes]

Could you stop spamming this forum with your bugs? How many thread you will create for them?

[Skybuck]

These are your bugs !

[Yankes]

My? how in any way could `error C2065: 'Pixel': undeclared identifier (compiling source file Geoscape\Globe.cpp)` be my bug? current OXC compiled, old OXC compiled, near all old branches compiled. And your code do not.

You tried deleted half of code base, you miss merge some old branch, you add some unrelated libraries to code.


My solution for you problem is simply revert every thing and go back to pristine OXC code, it will compile again.

[Skybuck]

My? how in any way could `error C2065: 'Pixel': undeclared identifier (compiling source file Geoscape\Globe.cpp)` be my bug? current OXC compiled, old OXC compiled, near all old branches compiled. And your code do not.

You tried deleted half of code base, you miss merge some old branch, you add some unrelated libraries to code.


My solution for you problem is simply revert every thing and go back to pristine OXC code, it will compile again.

This was merge between vanilla OpenXcom and ful 32 bit support (missspelled in commit message), some commit somewhere in vanilla xcom, came from and0303 or something... and then you merged it and made some fixes.

None of the old branches compile or link... in vs 2019... compatibility issues or yaml issues or code issues. You should install vs 2019 and see for yourself...  It's not easy to do the merge, one must choose which code path to include, choose A. A breaks, choose B B breaks, I tried to mixed it up... but still many errors.

See if you can merge the full 32 bit color branch yourself into vanilla x-com ! =D and get it compiling / running ! It will be worth it !