1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fix to ch79, lights was not saved during automatic map conversion from mapeditor with -DOMAPSCNV command switch.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6670 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Kriplo
2013-11-30 19:13:41 +00:00
parent 56b2260ff1
commit 9a67e804c6
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+9 -9
View File
@@ -15,9 +15,9 @@
#ifdef JA2EDITOR #ifdef JA2EDITOR
#ifdef JA2UB #ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.6513 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.6670 (Development Build)" };
#else #else
CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.6513 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.6670 (Development Build)" };
#endif #endif
// ------------------------------ // ------------------------------
@@ -27,11 +27,11 @@
//DEBUG BUILD VERSION //DEBUG BUILD VERSION
#ifdef JA2UB #ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.6513 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.6670 (Development Build)" };
#elif defined (JA113DEMO) #elif defined (JA113DEMO)
CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.6513 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.6670 (Development Build)" };
#else #else
CHAR16 zVersionLabel[256] = { L"Debug: v1.13.6513 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: v1.13.6670 (Development Build)" };
#endif #endif
#elif defined CRIPPLED_VERSION #elif defined CRIPPLED_VERSION
@@ -46,16 +46,16 @@
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
#ifdef JA2UB #ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.6513 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.6670 (Development Build)" };
#elif defined (JA113DEMO) #elif defined (JA113DEMO)
CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.6513 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.6670 (Development Build)" };
#else #else
CHAR16 zVersionLabel[256] = { L"Release v1.13.6513 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release v1.13.6670 (Development Build)" };
#endif #endif
#endif #endif
CHAR8 czVersionNumber[16] = { "Build 13.10.19" }; //YY.MM.DD CHAR8 czVersionNumber[16] = { "Build 13.11.30" }; //YY.MM.DD
CHAR16 zTrackingNumber[16] = { L"Z" }; CHAR16 zTrackingNumber[16] = { L"Z" };
// SAVE_GAME_VERSION is defined in header, change it there // SAVE_GAME_VERSION is defined in header, change it there
TileEngine/worlddef.cpp
+1 -1
View File
@@ -4256,7 +4256,7 @@ void LoadMapLights( INT8 **hBuffer )
iLSprite = LightSpriteCreate( str, TmpLight.uiLightType ); iLSprite = LightSpriteCreate( str, TmpLight.uiLightType );
//if this fails, then we will ignore the light. //if this fails, then we will ignore the light.
// ATE: Don't add ANY lights of mapscreen util is on // ATE: Don't add ANY lights of mapscreen util is on
if( iLSprite != -1 && guiCurrentScreen != MAPUTILITY_SCREEN ) if( iLSprite != -1/* && guiCurrentScreen != MAPUTILITY_SCREEN*/ )//dnl ch79 301113 lights will be reset in map utility screen
{ {
if( !gfCaves || gfEditMode ) if( !gfCaves || gfEditMode )
{ {
Utils/MapUtility.cpp
+4 -1
View File
@@ -25,6 +25,7 @@
#include "Editor Taskbar Utils.h" #include "Editor Taskbar Utils.h"
#include "Text Input.h" #include "Text Input.h"
#include "Cursor Control.h"//dnl ch78 271113 #include "Cursor Control.h"//dnl ch78 271113
#include "lighting.h"//dnl ch79 301113
#define MINIMAP_X_SIZE 88//RADAR_WINDOW_WIDTH #define MINIMAP_X_SIZE 88//RADAR_WINDOW_WIDTH
#define MINIMAP_Y_SIZE 44//RADAR_WINDOW_HEIGHT #define MINIMAP_Y_SIZE 44//RADAR_WINDOW_HEIGHT
@@ -175,13 +176,15 @@ UINT32 MapUtilScreenHandle(void)
return(MAPUTILITY_SCREEN); return(MAPUTILITY_SCREEN);
} }
sprintf(zFilename, "%s", FListNode->FileInfo.zFileName); sprintf(zFilename, "%s", FListNode->FileInfo.zFileName);
// OK, load maps and do overhead shrinkage of them... //dnl ch79 291113 // OK, load maps and do overhead shrinkage of them... //dnl ch79 301113
if(!LoadWorld(zFilename, &dMajorMapVersion, &ubMinorMapVersion)) if(!LoadWorld(zFilename, &dMajorMapVersion, &ubMinorMapVersion))
return(ERROR_SCREEN); return(ERROR_SCREEN);
if(strcmp(gzCommandLine, "-DOMAPSCNV") == 0) if(strcmp(gzCommandLine, "-DOMAPSCNV") == 0)
if(!(dMajorMapVersion == MAJOR_MAP_VERSION && ubMinorMapVersion == MINOR_MAP_VERSION && gMapInformation.ubMapVersion == MINOR_MAP_VERSION)) if(!(dMajorMapVersion == MAJOR_MAP_VERSION && ubMinorMapVersion == MINOR_MAP_VERSION && gMapInformation.ubMapVersion == MINOR_MAP_VERSION))
if(!SaveWorld(zFilename)) if(!SaveWorld(zFilename))
return(ERROR_SCREEN); return(ERROR_SCREEN);
LightReset();
LightSpriteRenderAll();
} }
// Render small map // Render small map
//iOffsetHorizontal = (SCREEN_WIDTH / 2) - (640 / 2);// Horizontal start postion of the overview map //iOffsetHorizontal = (SCREEN_WIDTH / 2) - (640 / 2);// Horizontal start postion of the overview map