mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-12 03:14:00 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #60 from titison/feature/mapPreviewWithSpecificTileset

Browse Source 
Specific Tileset with preview-map option
This commit is contained in:
titiger
2016-01-09 19:28:21 +01:00
parent e611dfe4a5 12102f8791
commit 8dd7cb21e8
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/glest_game/main/main.cpp
View File

@@ -5212,11 +5212,17 @@ int glestMain(int argc, char** argv) {
vector<string> paramPartTokens; vector<string> paramPartTokens;
Tokenize(mapName,paramPartTokens,"="); Tokenize(mapName,paramPartTokens,"=");
if(paramPartTokens.size() >= 2 && paramPartTokens[1].length() > 0) { if(paramPartTokens.size() >= 2 && paramPartTokens[1].length() > 0) {
string autoloadMapName = paramPartTokens[1]; vector<string> paramPartTokens2;
string tileset="forest";
Tokenize(paramPartTokens[1],paramPartTokens2,",");
if(paramPartTokens2.size() >= 2 && paramPartTokens2[1].length() > 0) {
tileset = paramPartTokens2[1];
}
string autoloadMapName = paramPartTokens2[0];
GameSettings *gameSettings = &startupGameSettings; GameSettings *gameSettings = &startupGameSettings;
gameSettings->setMap(autoloadMapName); gameSettings->setMap(autoloadMapName);
gameSettings->setTileset("forest"); gameSettings->setTileset(tileset);
gameSettings->setTech("megapack"); gameSettings->setTech("megapack");
gameSettings->setDefaultUnits(false); gameSettings->setDefaultUnits(false);
gameSettings->setDefaultResources(false); gameSettings->setDefaultResources(false);

2
source/shared_lib/include/platform/sdl/platform_main.h
View File

@@ -255,7 +255,7 @@ void printParameterHelp(const char *argv0, bool foundInvalidArgs) {
printf("\n%s=x\t\t\tAuto load a mod by mod pathname.",GAME_ARGS[GAME_ARG_MOD]); printf("\n%s=x\t\t\tAuto load a mod by mod pathname.",GAME_ARGS[GAME_ARG_MOD]);
// "================================================================================" // "================================================================================"
printf("\n%s=x\t\t\tAuto Preview a map by map name.",GAME_ARGS[GAME_ARG_PREVIEW_MAP]); printf("\n%s=Map,Tileset\tAuto Preview a map by map name. (tileset is optional)",GAME_ARGS[GAME_ARG_PREVIEW_MAP]);
printf("\n%s\t\t\tdisplays the version string of this program.",GAME_ARGS[GAME_ARG_VERSION]); printf("\n%s\t\t\tdisplays the version string of this program.",GAME_ARGS[GAME_ARG_VERSION]);
printf("\n%s\t\t\tdisplays your video driver's OpenGL info.",GAME_ARGS[GAME_ARG_OPENGL_INFO]); printf("\n%s\t\t\tdisplays your video driver's OpenGL info.",GAME_ARGS[GAME_ARG_OPENGL_INFO]);
printf("\n%s\t\t\tdisplays your SDL version information.",GAME_ARGS[GAME_ARG_SDL_INFO]); printf("\n%s\t\t\tdisplays your SDL version information.",GAME_ARGS[GAME_ARG_SDL_INFO]);