ソースを参照

* compilation fix under VC++
* fix for a bug that prevented from loading a map (convertHordes cannot be called before town field is set)
* normalized line endings in CBitmapHandler.cpp

mateuszb 15 年 前
コミット
1708894790
2 ファイル変更2 行追加2 行削除
  1. 1 1
      client/CBitmapHandler.cpp
  2. 1 1
      lib/CGameState.cpp

+ 1 - 1
client/CBitmapHandler.cpp

@@ -158,7 +158,7 @@ SDL_Surface * BitmapHandler::loadBitmap(std::string fname, bool setKey)
 		return NULL;
 	}
 	if(e->offset<0)
-	{
+	{
 		fname = e->realName;
 		fname = DATA_DIR "/Data/" + fname;
 		FILE * f = fopen(fname.c_str(),"r");

+ 1 - 1
lib/CGameState.cpp

@@ -1168,7 +1168,7 @@ void CGameState::randomizeObject(CGObjectInstance *cur)
 				t->defInfo = forts[t->subID];
 			else
 				t->defInfo = villages[t->subID]; 
-			convertHordes(t);
+			//convertHordes(t);
 		}
 		return;
 	}