From 18144fecb578d7c5564ee1e0544e15587be13022 Mon Sep 17 00:00:00 2001
From: jsalmon3 <>
Date: Thu, 2 Oct 2003 03:07:37 +0000
Subject: [PATCH] Cleanup
---
src/network/commands.cpp | 1198 +++++++++++++++++++-------------------
1 file changed, 599 insertions(+), 599 deletions(-)
diff --git a/src/network/commands.cpp b/src/network/commands.cpp
index 6f7d0ced2..64e259c8d 100644
--- a/src/network/commands.cpp
+++ b/src/network/commands.cpp
@@ -71,7 +71,7 @@ local SCM ReplayLog; /// Replay log
local FILE* LogFile; /// Replay log file
local unsigned long NextLogCycle; /// Next log cycle number
local int InitReplay; /// Initialize replay
-local char *ReplayPlayers[PlayerMax]; /// Player names
+local char* ReplayPlayers[PlayerMax]; /// Player names
//----------------------------------------------------------------------------
@@ -95,10 +95,10 @@ local char *ReplayPlayers[PlayerMax]; /// Player names
** @param value optional command argument (unit-type,...).
** @param num optional number argument
*/
-global void CommandLog(const char* name,const Unit* unit,int flag,
- int x,int y,const Unit* dest,const char* value,int num)
+global void CommandLog(const char* name, const Unit* unit, int flag,
+ int x, int y, const Unit* dest, const char* value, int num)
{
- if( CommandLogDisabled ) { // No log wanted
+ if (CommandLogDisabled) { // No log wanted
return;
}
@@ -106,127 +106,127 @@ global void CommandLog(const char* name,const Unit* unit,int flag,
// Create and write header of log file. The player number is added
// to the save file name, to test more than one player on one computer.
//
- if( !LogFile ) {
+ if (!LogFile) {
time_t now;
char buf[PATH_MAX];
char* s;
char* s1;
#ifdef USE_WIN32
- strcpy(buf,GameName);
+ strcpy(buf, GameName);
mkdir(buf);
- strcat(buf,"/logs");
+ strcat(buf, "/logs");
mkdir(buf);
#else
- sprintf(buf,"%s/%s",getenv("HOME"),STRATAGUS_HOME_PATH);
- mkdir(buf,0777);
- strcat(buf,"/");
- strcat(buf,GameName);
- mkdir(buf,0777);
- strcat(buf,"/logs");
- mkdir(buf,0777);
+ sprintf(buf, "%s/%s", getenv("HOME"), STRATAGUS_HOME_PATH);
+ mkdir(buf, 0777);
+ strcat(buf, "/");
+ strcat(buf, GameName);
+ mkdir(buf, 0777);
+ strcat(buf, "/logs");
+ mkdir(buf, 0777);
#endif
- sprintf(buf,"%s/log_of_stratagus_%d.log",buf,ThisPlayer->Player);
- LogFile=fopen(buf,"wb");
- if( !LogFile ) {
+ sprintf(buf, "%s/log_of_stratagus_%d.log", buf, ThisPlayer->Player);
+ LogFile = fopen(buf, "wb");
+ if (!LogFile) {
return;
}
time(&now);
- s=ctime(&now);
- if( (s1=strchr(s,'\n')) ) {
- *s1='\0';
+ s = ctime(&now);
+ if ((s1 = strchr(s, '\n'))) {
+ *s1 = '\0';
}
//
// Parseable header
//
- fprintf(LogFile,"(replay-log\n");
- fprintf(LogFile," 'comment\t\"Generated by Stratagus Version " VERSION "\"\n");
- fprintf(LogFile," 'comment\t\"Visit http://Stratagus.Org for more information\"\n");
- fprintf(LogFile," 'comment\t\"$Id$\"\n");
- if( NetworkFildes==(Socket)-1 ) {
- fprintf(LogFile," 'type\t\"%s\"\n","single-player");
- fprintf(LogFile," 'race\t%d\n",GameSettings.Presets[0].Race);
+ fprintf(LogFile, "(replay-log\n");
+ fprintf(LogFile, " 'comment\t\"Generated by Stratagus Version " VERSION "\"\n");
+ fprintf(LogFile, " 'comment\t\"Visit http://Stratagus.Org for more information\"\n");
+ fprintf(LogFile, " 'comment\t\"$Id$\"\n");
+ if (NetworkFildes == (Socket)-1) {
+ fprintf(LogFile, " 'type\t\"%s\"\n", "single-player");
+ fprintf(LogFile, " 'race\t%d\n", GameSettings.Presets[0].Race);
} else {
int i;
- fprintf(LogFile," 'type\t\"%s\"\n","multi-player");
- for( i=0; i<PlayerMax; ++i ) {
- fprintf(LogFile," 'player\t(list 'number %d 'name \"%s\" 'race %d 'team %d 'type %d)\n",
- i,Players[i].Name,GameSettings.Presets[i].Race,
- GameSettings.Presets[i].Team,GameSettings.Presets[i].Type);
+ fprintf(LogFile, " 'type\t\"%s\"\n", "multi-player");
+ for (i = 0; i < PlayerMax; ++i) {
+ fprintf(LogFile, " 'player\t(list 'number %d 'name \"%s\" 'race %d 'team %d 'type %d)\n",
+ i, Players[i].Name, GameSettings.Presets[i].Race,
+ GameSettings.Presets[i].Team, GameSettings.Presets[i].Type);
}
- fprintf(LogFile," 'local-player\t%d\n",ThisPlayer->Player);
+ fprintf(LogFile, " 'local-player\t%d\n", ThisPlayer->Player);
}
- fprintf(LogFile," 'date\t\"%s\"\n",s);
- fprintf(LogFile," 'map\t\"%s\"\n",TheMap.Description);
- fprintf(LogFile," 'map-id\t%u\n",TheMap.Info->MapUID);
- fprintf(LogFile," 'map-path\t\"%s\"\n",CurrentMapPath);
- fprintf(LogFile," 'resources\t%d\n",GameSettings.Resources);
- fprintf(LogFile," 'num-units\t%d\n",GameSettings.NumUnits);
- fprintf(LogFile," 'tileset\t%d\n",GameSettings.Terrain);
- fprintf(LogFile," 'no-fow\t%d\n",TheMap.NoFogOfWar);
- fprintf(LogFile," 'reveal-map\t%d\n",GameSettings.RevealMap);
- fprintf(LogFile," 'game-type\t%d\n",GameSettings.GameType);
- fprintf(LogFile," 'opponents\t%d\n",GameSettings.Opponents);
- fprintf(LogFile," 'engine\t'(%d %d %d)\n",
- StratagusMajorVersion,StratagusMinorVersion,StratagusPatchLevel);
- fprintf(LogFile," 'network\t'(%d %d %d)\n",
+ fprintf(LogFile, " 'date\t\"%s\"\n", s);
+ fprintf(LogFile, " 'map\t\"%s\"\n", TheMap.Description);
+ fprintf(LogFile, " 'map-id\t%u\n", TheMap.Info->MapUID);
+ fprintf(LogFile, " 'map-path\t\"%s\"\n", CurrentMapPath);
+ fprintf(LogFile, " 'resources\t%d\n", GameSettings.Resources);
+ fprintf(LogFile, " 'num-units\t%d\n", GameSettings.NumUnits);
+ fprintf(LogFile, " 'tileset\t%d\n", GameSettings.Terrain);
+ fprintf(LogFile, " 'no-fow\t%d\n", TheMap.NoFogOfWar);
+ fprintf(LogFile, " 'reveal-map\t%d\n", GameSettings.RevealMap);
+ fprintf(LogFile, " 'game-type\t%d\n", GameSettings.GameType);
+ fprintf(LogFile, " 'opponents\t%d\n", GameSettings.Opponents);
+ fprintf(LogFile, " 'engine\t'(%d %d %d)\n",
+ StratagusMajorVersion, StratagusMinorVersion, StratagusPatchLevel);
+ fprintf(LogFile, " 'network\t'(%d %d %d)\n",
NetworkProtocolMajorVersion,
NetworkProtocolMinorVersion,
NetworkProtocolPatchLevel);
- fprintf(LogFile," )\n");
+ fprintf(LogFile, " )\n");
}
- if( !name ) {
+ if (!name) {
return;
}
//
// Frame, unit, (type-ident only to be better readable).
//
- if( unit ) {
- fprintf(LogFile,"(log %lu 'unit %d 'ident '%s 'name '%s 'flag '%s",
- GameCycle,UnitNumber(unit),unit->Type->Ident,name,
- flag ? "flush" : "append");
+ if (unit) {
+ fprintf(LogFile, "(log %lu 'unit %d 'ident '%s 'name '%s 'flag '%s",
+ GameCycle, UnitNumber(unit), unit->Type->Ident, name,
+ flag ? "flush" : "append");
} else {
- fprintf(LogFile,"(log %lu 'name '%s 'flag '%s",
- GameCycle,name, flag ? "flush" : "append");
+ fprintf(LogFile, "(log %lu 'name '%s 'flag '%s",
+ GameCycle,name, flag ? "flush" : "append");
}
//
// Coordinates given.
//
- if( x!=-1 || y!=-1 ) {
- fprintf(LogFile," 'pos '(%d %d)",x,y);
+ if (x != -1 || y != -1) {
+ fprintf(LogFile, " 'pos '(%d %d)", x, y);
}
//
// Destination given.
//
- if( dest ) {
- fprintf(LogFile," 'dest '%d",UnitNumber(dest));
+ if (dest) {
+ fprintf(LogFile, " 'dest '%d", UnitNumber(dest));
}
//
// Value given.
//
- if( value ) {
- fprintf(LogFile," 'value \"%s\"",value);
+ if (value) {
+ fprintf(LogFile, " 'value \"%s\"", value);
}
//
// Number given.
//
- if( num!=-1 ) {
- fprintf(LogFile," 'num %d",num);
+ if (num != -1) {
+ fprintf(LogFile, " 'num %d", num);
}
- if( unit ) {
- fprintf(LogFile,") ;%d:%d %X",unit->Player->Player,unit->Refs,
- SyncRandSeed);
+ if (unit) {
+ fprintf(LogFile, ") ;%d:%d %X", unit->Player->Player, unit->Refs,
+ SyncRandSeed);
} else {
- fprintf(LogFile,") ;-:- %X",SyncRandSeed);
+ fprintf(LogFile, ") ;-:- %X",SyncRandSeed);
}
- fprintf(LogFile,"\n");
+ fprintf(LogFile, "\n");
fflush(LogFile);
}
@@ -237,16 +237,16 @@ local SCM CclLog(SCM list)
{
SCM var;
- var=gh_symbol2scm("*replay_log*");
- if( gh_null_p(symbol_value(var,NIL)) ) {
- setvar(var,cons(list,NIL),NIL);
+ var = gh_symbol2scm("*replay_log*");
+ if (gh_null_p(symbol_value(var, NIL))) {
+ setvar(var, cons(list, NIL), NIL);
} else {
SCM tmp;
- tmp=symbol_value(var,NIL);
- while( !gh_null_p(gh_cdr(tmp)) ) {
- tmp=gh_cdr(tmp);
+ tmp = symbol_value(var, NIL);
+ while (!gh_null_p(gh_cdr(tmp))) {
+ tmp = gh_cdr(tmp);
}
- gh_set_cdr_x(tmp,cons(list,NIL));
+ gh_set_cdr_x(tmp, cons(list, NIL));
}
return SCM_UNSPECIFIED;
@@ -272,118 +272,118 @@ local SCM CclReplayLog(SCM list)
int nver2;
int nver3;
- while( !gh_null_p(list) ) {
- value=gh_car(list);
- list=gh_cdr(list);
+ while (!gh_null_p(list)) {
+ value = gh_car(list);
+ list = gh_cdr(list);
- if( gh_eq_p(value,gh_symbol2scm("comment")) ) {
- comment=get_c_string(gh_car(list));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("type")) ) {
- logtype=get_c_string(gh_car(list));
- if( !strcmp(logtype,"multi-player") ) {
+ if (gh_eq_p(value, gh_symbol2scm("comment"))) {
+ comment = get_c_string(gh_car(list));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("type"))) {
+ logtype = get_c_string(gh_car(list));
+ if (!strcmp(logtype, "multi-player")) {
ExitNetwork1();
- NetPlayers=2;
+ NetPlayers = 2;
}
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("date")) ) {
- logdate=get_c_string(gh_car(list));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("map")) ) {
- map=get_c_string(gh_car(list));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("map-id")) ) {
- mapid=gh_scm2int(gh_car(list));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("map-path")) ) {
- mappath=get_c_string(gh_car(list));
- strcpy(CurrentMapPath,mappath);
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("race")) ) {
- GameSettings.Presets[0].Race=gh_scm2int(gh_car(list));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("resources")) ) {
- GameSettings.Resources=gh_scm2int(gh_car(list));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("num-units")) ) {
- GameSettings.NumUnits=gh_scm2int(gh_car(list));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("tileset")) ) {
- GameSettings.Terrain=gh_scm2int(gh_car(list));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("no-fow")) ) {
- TheMap.NoFogOfWar=GameSettings.NoFogOfWar=gh_scm2int(gh_car(list));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("reveal-map")) ) {
- FlagRevealMap=GameSettings.RevealMap=gh_scm2int(gh_car(list));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("game-type")) ) {
- GameSettings.GameType=gh_scm2int(gh_car(list));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("opponents")) ) {
- GameSettings.Opponents=gh_scm2int(gh_car(list));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("engine")) ) {
- sublist=gh_car(list);
- ever1=gh_scm2int(gh_car(sublist));
- sublist=gh_cdr(sublist);
- ever2=gh_scm2int(gh_car(sublist));
- sublist=gh_cdr(sublist);
- ever3=gh_scm2int(gh_car(sublist));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("date"))) {
+ logdate = get_c_string(gh_car(list));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("map"))) {
+ map = get_c_string(gh_car(list));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("map-id"))) {
+ mapid = gh_scm2int(gh_car(list));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("map-path"))) {
+ mappath = get_c_string(gh_car(list));
+ strcpy(CurrentMapPath, mappath);
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("race"))) {
+ GameSettings.Presets[0].Race = gh_scm2int(gh_car(list));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("resources"))) {
+ GameSettings.Resources = gh_scm2int(gh_car(list));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("num-units"))) {
+ GameSettings.NumUnits = gh_scm2int(gh_car(list));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("tileset"))) {
+ GameSettings.Terrain = gh_scm2int(gh_car(list));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("no-fow"))) {
+ TheMap.NoFogOfWar = GameSettings.NoFogOfWar = gh_scm2int(gh_car(list));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("reveal-map"))) {
+ FlagRevealMap = GameSettings.RevealMap = gh_scm2int(gh_car(list));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("game-type"))) {
+ GameSettings.GameType = gh_scm2int(gh_car(list));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("opponents"))) {
+ GameSettings.Opponents = gh_scm2int(gh_car(list));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("engine"))) {
+ sublist = gh_car(list);
+ ever1 = gh_scm2int(gh_car(sublist));
+ sublist = gh_cdr(sublist);
+ ever2 = gh_scm2int(gh_car(sublist));
+ sublist = gh_cdr(sublist);
+ ever3 = gh_scm2int(gh_car(sublist));
// FIXME: check engine version
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("network")) ) {
- sublist=gh_car(list);
- nver1=gh_scm2int(gh_car(sublist));
- sublist=gh_cdr(sublist);
- nver2=gh_scm2int(gh_car(sublist));
- sublist=gh_cdr(sublist);
- nver3=gh_scm2int(gh_car(sublist));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("network"))) {
+ sublist = gh_car(list);
+ nver1 = gh_scm2int(gh_car(sublist));
+ sublist = gh_cdr(sublist);
+ nver2 = gh_scm2int(gh_car(sublist));
+ sublist = gh_cdr(sublist);
+ nver3 = gh_scm2int(gh_car(sublist));
// FIXME: check network version
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("player")) ) {
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("player"))) {
int num;
int race;
int team;
int type;
char *name;
- ReplayGameType=ReplayMultiPlayer;
- num=-1;
- race=team=type=SettingsPresetMapDefault;
- name=NULL;
- sublist=gh_car(list);
- while( !gh_null_p(sublist) ) {
- value=gh_car(sublist);
- sublist=gh_cdr(sublist);
- if( gh_eq_p(value,gh_symbol2scm("number")) ) {
- num=gh_scm2int(gh_car(sublist));
- sublist=gh_cdr(sublist);
- } else if( gh_eq_p(value,gh_symbol2scm("name")) ) {
- name=gh_scm2newstr(gh_car(sublist), 0);
- sublist=gh_cdr(sublist);
- } else if( gh_eq_p(value,gh_symbol2scm("race")) ) {
- race=gh_scm2int(gh_car(sublist));
- sublist=gh_cdr(sublist);
- } else if( gh_eq_p(value,gh_symbol2scm("team")) ) {
- team=gh_scm2int(gh_car(sublist));
- sublist=gh_cdr(sublist);
- } else if( gh_eq_p(value,gh_symbol2scm("type")) ) {
- type=gh_scm2int(gh_car(sublist));
- sublist=gh_cdr(sublist);
+ ReplayGameType = ReplayMultiPlayer;
+ num = -1;
+ race = team = type = SettingsPresetMapDefault;
+ name = NULL;
+ sublist = gh_car(list);
+ while (!gh_null_p(sublist)) {
+ value = gh_car(sublist);
+ sublist = gh_cdr(sublist);
+ if (gh_eq_p(value, gh_symbol2scm("number"))) {
+ num = gh_scm2int(gh_car(sublist));
+ sublist = gh_cdr(sublist);
+ } else if (gh_eq_p(value, gh_symbol2scm("name"))) {
+ name = gh_scm2newstr(gh_car(sublist), 0);
+ sublist = gh_cdr(sublist);
+ } else if (gh_eq_p(value, gh_symbol2scm("race"))) {
+ race = gh_scm2int(gh_car(sublist));
+ sublist = gh_cdr(sublist);
+ } else if (gh_eq_p(value, gh_symbol2scm("team"))) {
+ team = gh_scm2int(gh_car(sublist));
+ sublist = gh_cdr(sublist);
+ } else if (gh_eq_p(value, gh_symbol2scm("type"))) {
+ type = gh_scm2int(gh_car(sublist));
+ sublist = gh_cdr(sublist);
}
}
- if( num!=-1 ) {
- GameSettings.Presets[num].Race=race;
- GameSettings.Presets[num].Team=team;
- GameSettings.Presets[num].Type=type;
- ReplayPlayers[num]=name;
+ if (num != -1) {
+ GameSettings.Presets[num].Race = race;
+ GameSettings.Presets[num].Team = team;
+ GameSettings.Presets[num].Type = type;
+ ReplayPlayers[num] = name;
}
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("local-player")) ) {
- NetLocalPlayerNumber=gh_scm2int(gh_car(list));
- list=gh_cdr(list);
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("local-player"))) {
+ NetLocalPlayerNumber = gh_scm2int(gh_car(list));
+ list = gh_cdr(list);
}
}
@@ -399,33 +399,33 @@ global int LoadReplay(char* name)
{
int i;
- for( i=0; i<PlayerMax; ++i ) {
- if( ReplayPlayers[i] ) {
+ for (i = 0; i < PlayerMax; ++i) {
+ if (ReplayPlayers[i]) {
free(ReplayPlayers[i]);
- ReplayPlayers[i]=NULL;
+ ReplayPlayers[i] = NULL;
}
}
- ReplayGameType=ReplaySinglePlayer;
+ ReplayGameType = ReplaySinglePlayer;
- gh_new_procedureN("log",CclLog);
- gh_new_procedureN("replay-log",CclReplayLog);
- gh_define("*replay_log*",NIL);
- vload(name,0,1);
+ gh_new_procedureN("log", CclLog);
+ gh_new_procedureN("replay-log", CclReplayLog);
+ gh_define("*replay_log*", NIL);
+ vload(name, 0, 1);
- ReplayLog=symbol_value(gh_symbol2scm("*replay_log*"),NIL);
- NextLogCycle=~0UL;
- if( !CommandLogDisabled ) {
- CommandLogDisabled=1;
- DisabledLog=1;
+ ReplayLog = symbol_value(gh_symbol2scm("*replay_log*"), NIL);
+ NextLogCycle = ~0UL;
+ if (!CommandLogDisabled) {
+ CommandLogDisabled = 1;
+ DisabledLog = 1;
}
- if( ShowTips ) {
- ShowTips=0;
- DisabledShowTips=1;
+ if (ShowTips) {
+ ShowTips = 0;
+ DisabledShowTips = 1;
} else {
- DisabledShowTips=0;
+ DisabledShowTips = 0;
}
- GameObserve=1;
- InitReplay=1;
+ GameObserve = 1;
+ InitReplay = 1;
return 0;
}
@@ -435,9 +435,9 @@ global int LoadReplay(char* name)
*/
global void EndReplayLog(void)
{
- if( LogFile ) {
+ if (LogFile) {
fclose(LogFile);
- LogFile=NULL;
+ LogFile = NULL;
}
}
@@ -446,21 +446,21 @@ global void EndReplayLog(void)
*/
global void CleanReplayLog(void)
{
- ReplayLog=NIL;
+ ReplayLog = NIL;
// FIXME: LoadGame disables the log since replays aren't saved in the
// FIXME: saved games yet. Always enable the log again for now even
// FIXME: though it ignores the -l command line option.
-// if( DisabledLog ) {
- CommandLogDisabled=0;
- DisabledLog=0;
+// if (DisabledLog) {
+ CommandLogDisabled = 0;
+ DisabledLog = 0;
// }
- if( DisabledShowTips ) {
- ShowTips=1;
- DisabledShowTips=0;
+ if (DisabledShowTips) {
+ ShowTips = 1;
+ DisabledShowTips = 0;
}
- GameObserve=0;
- NetPlayers=0;
- ReplayGameType=ReplayNone;
+ GameObserve = 0;
+ NetPlayers = 0;
+ ReplayGameType = ReplayNone;
}
/**
@@ -481,146 +481,146 @@ local void DoNextReplay(void)
int num;
Unit* dunit;
- list=gh_car(ReplayLog);
+ list = gh_car(ReplayLog);
- NextLogCycle=gh_scm2int(gh_car(list));
- list=gh_cdr(list);
+ NextLogCycle = gh_scm2int(gh_car(list));
+ list = gh_cdr(list);
- if( NextLogCycle!=GameCycle ) {
+ if (NextLogCycle != GameCycle) {
return;
}
- NextLogCycle=~0UL;
- unit=-1;
- name=NULL;
- flags=0;
- posx=-1;
- posy=-1;
- dunit=NoUnitP;
- val=NULL;
- num=-1;
- while( !gh_null_p(list) ) {
- value=gh_car(list);
- list=gh_cdr(list);
+ NextLogCycle = ~0UL;
+ unit = -1;
+ name = NULL;
+ flags = 0;
+ posx = -1;
+ posy = -1;
+ dunit = NoUnitP;
+ val = NULL;
+ num = -1;
+ while (!gh_null_p(list)) {
+ value = gh_car(list);
+ list = gh_cdr(list);
- if( gh_eq_p(value,gh_symbol2scm("unit")) ) {
- unit=gh_scm2int(gh_car(list));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("ident")) ) {
- ident=get_c_string(gh_car(list));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("name")) ) {
- name=get_c_string(gh_car(list));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("flag")) ) {
- flag=get_c_string(gh_car(list));
- if( !strcmp(flag,"flush") ) {
- flags=1;
+ if (gh_eq_p(value, gh_symbol2scm("unit"))) {
+ unit = gh_scm2int(gh_car(list));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("ident"))) {
+ ident = get_c_string(gh_car(list));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("name"))) {
+ name = get_c_string(gh_car(list));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("flag"))) {
+ flag = get_c_string(gh_car(list));
+ if (!strcmp(flag, "flush")) {
+ flags = 1;
}
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("pos")) ) {
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("pos"))) {
SCM sublist;
- sublist=gh_car(list);
- posx=gh_scm2int(gh_car(sublist));
- sublist=gh_cdr(sublist);
- posy=gh_scm2int(gh_car(sublist));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("dest")) ) {
- dunit=UnitSlots[gh_scm2int(gh_car(list))];
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("value")) ) {
- val=get_c_string(gh_car(list));
- list=gh_cdr(list);
- } else if( gh_eq_p(value,gh_symbol2scm("num")) ) {
- num=gh_scm2int(gh_car(list));
- list=gh_cdr(list);
+ sublist = gh_car(list);
+ posx = gh_scm2int(gh_car(sublist));
+ sublist = gh_cdr(sublist);
+ posy = gh_scm2int(gh_car(sublist));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("dest"))) {
+ dunit = UnitSlots[gh_scm2int(gh_car(list))];
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("value"))) {
+ val = get_c_string(gh_car(list));
+ list = gh_cdr(list);
+ } else if (gh_eq_p(value, gh_symbol2scm("num"))) {
+ num = gh_scm2int(gh_car(list));
+ list = gh_cdr(list);
}
}
- if( !strcmp(name,"stop") ) {
+ if (!strcmp(name, "stop")) {
SendCommandStopUnit(UnitSlots[unit]);
- } else if( !strcmp(name,"stand-ground") ) {
- SendCommandStandGround(UnitSlots[unit],flags);
- } else if( !strcmp(name,"follow") ) {
- SendCommandFollow(UnitSlots[unit],dunit,flags);
- } else if( !strcmp(name,"move") ) {
- SendCommandMove(UnitSlots[unit],posx,posy,flags);
- } else if( !strcmp(name,"repair") ) {
- SendCommandRepair(UnitSlots[unit],posx,posy,dunit,flags);
- } else if( !strcmp(name,"attack") ) {
- SendCommandAttack(UnitSlots[unit],posx,posy,dunit,flags);
- } else if( !strcmp(name,"attack-ground") ) {
- SendCommandAttackGround(UnitSlots[unit],posx,posy,flags);
- } else if( !strcmp(name,"patrol") ) {
- SendCommandPatrol(UnitSlots[unit],posx,posy,flags);
- } else if( !strcmp(name,"board") ) {
- SendCommandBoard(UnitSlots[unit],posx,posy,dunit,flags);
- } else if( !strcmp(name,"unload") ) {
- SendCommandUnload(UnitSlots[unit],posx,posy,dunit,flags);
- } else if( !strcmp(name,"build") ) {
- SendCommandBuildBuilding(UnitSlots[unit],posx,posy,UnitTypeByIdent(val),flags);
- } else if( !strcmp(name,"cancel-build") ) {
- SendCommandCancelBuilding(UnitSlots[unit],dunit);
- } else if( !strcmp(name,"resource-loc") ) {
- SendCommandResourceLoc(UnitSlots[unit],posx,posy,flags);
- } else if( !strcmp(name,"resource") ) {
- SendCommandResource(UnitSlots[unit],dunit,flags);
- } else if( !strcmp(name,"return") ) {
- SendCommandReturnGoods(UnitSlots[unit],dunit,flags);
- } else if( !strcmp(name,"train") ) {
- SendCommandTrainUnit(UnitSlots[unit],UnitTypeByIdent(val),flags);
- } else if( !strcmp(name,"cancel-train") ) {
- SendCommandCancelTraining(UnitSlots[unit],num,val?UnitTypeByIdent(val):NULL);
- } else if( !strcmp(name,"upgrade-to") ) {
- SendCommandUpgradeTo(UnitSlots[unit],UnitTypeByIdent(val),flags);
- } else if( !strcmp(name,"cancel-upgrade-to") ) {
+ } else if (!strcmp(name, "stand-ground")) {
+ SendCommandStandGround(UnitSlots[unit], flags);
+ } else if (!strcmp(name, "follow")) {
+ SendCommandFollow(UnitSlots[unit], dunit, flags);
+ } else if (!strcmp(name, "move")) {
+ SendCommandMove(UnitSlots[unit], posx, posy, flags);
+ } else if (!strcmp(name, "repair")) {
+ SendCommandRepair(UnitSlots[unit], posx, posy, dunit, flags);
+ } else if (!strcmp(name, "attack")) {
+ SendCommandAttack(UnitSlots[unit], posx, posy, dunit, flags);
+ } else if (!strcmp(name, "attack-ground")) {
+ SendCommandAttackGround(UnitSlots[unit], posx, posy, flags);
+ } else if (!strcmp(name, "patrol")) {
+ SendCommandPatrol(UnitSlots[unit], posx, posy, flags);
+ } else if (!strcmp(name, "board")) {
+ SendCommandBoard(UnitSlots[unit], posx, posy, dunit, flags);
+ } else if (!strcmp(name, "unload")) {
+ SendCommandUnload(UnitSlots[unit], posx, posy, dunit, flags);
+ } else if (!strcmp(name, "build")) {
+ SendCommandBuildBuilding(UnitSlots[unit], posx, posy, UnitTypeByIdent(val), flags);
+ } else if (!strcmp(name, "cancel-build")) {
+ SendCommandCancelBuilding(UnitSlots[unit], dunit);
+ } else if (!strcmp(name, "resource-loc")) {
+ SendCommandResourceLoc(UnitSlots[unit], posx, posy, flags);
+ } else if (!strcmp(name, "resource")) {
+ SendCommandResource(UnitSlots[unit], dunit, flags);
+ } else if (!strcmp(name, "return")) {
+ SendCommandReturnGoods(UnitSlots[unit], dunit, flags);
+ } else if (!strcmp(name, "train")) {
+ SendCommandTrainUnit(UnitSlots[unit], UnitTypeByIdent(val), flags);
+ } else if (!strcmp(name, "cancel-train")) {
+ SendCommandCancelTraining(UnitSlots[unit], num, val ? UnitTypeByIdent(val) : NULL);
+ } else if (!strcmp(name, "upgrade-to")) {
+ SendCommandUpgradeTo(UnitSlots[unit], UnitTypeByIdent(val), flags);
+ } else if (!strcmp(name, "cancel-upgrade-to")) {
SendCommandCancelUpgradeTo(UnitSlots[unit]);
- } else if( !strcmp(name,"research") ) {
- SendCommandResearch(UnitSlots[unit],UpgradeByIdent(val),flags);
- } else if( !strcmp(name,"cancel-research") ) {
+ } else if (!strcmp(name, "research")) {
+ SendCommandResearch(UnitSlots[unit],UpgradeByIdent(val), flags);
+ } else if (!strcmp(name, "cancel-research")) {
SendCommandCancelResearch(UnitSlots[unit]);
- } else if( !strcmp(name,"demolish") ) {
- SendCommandDemolish(UnitSlots[unit],posx,posy,dunit,flags);
- } else if( !strcmp(name,"spell-cast") ) {
- SendCommandSpellCast(UnitSlots[unit],posx,posy,dunit,num,flags);
- } else if( !strcmp(name,"auto-spell-cast") ) {
- SendCommandAutoSpellCast(UnitSlots[unit],num,posx);
- } else if( !strcmp(name,"diplomacy") ) {
+ } else if (!strcmp(name, "demolish")) {
+ SendCommandDemolish(UnitSlots[unit], posx, posy, dunit, flags);
+ } else if (!strcmp(name, "spell-cast")) {
+ SendCommandSpellCast(UnitSlots[unit], posx, posy, dunit, num, flags);
+ } else if (!strcmp(name, "auto-spell-cast")) {
+ SendCommandAutoSpellCast(UnitSlots[unit], num, posx);
+ } else if (!strcmp(name, "diplomacy")) {
int state;
- if( !strcmp(val,"neutral") ) {
- state=DiplomacyNeutral;
- } else if( !strcmp(val,"allied") ) {
- state=DiplomacyAllied;
- } else if( !strcmp(val,"enemy") ) {
- state=DiplomacyEnemy;
- } else if( !strcmp(val,"crazy") ) {
- state=DiplomacyCrazy;
+ if (!strcmp(val, "neutral")) {
+ state = DiplomacyNeutral;
+ } else if (!strcmp(val, "allied")) {
+ state = DiplomacyAllied;
+ } else if (!strcmp(val, "enemy")) {
+ state = DiplomacyEnemy;
+ } else if (!strcmp(val, "crazy")) {
+ state = DiplomacyCrazy;
} else {
DebugLevel0Fn("Invalid diplomacy command: %s" _C_ val);
- state=-1;
+ state = -1;
}
- SendCommandDiplomacy(posx,state,posy);
- } else if( !strcmp(name,"shared-vision") ) {
+ SendCommandDiplomacy(posx, state, posy);
+ } else if (!strcmp(name, "shared-vision")) {
int state;
- state=atoi(val);
- if( state!=0 && state!=1 ) {
+ state = atoi(val);
+ if (state != 0 && state != 1) {
DebugLevel0Fn("Invalid shared vision command: %s" _C_ val);
- state=0;
+ state = 0;
}
- SendCommandSharedVision(posx,state,posy);
- } else if( !strcmp(name,"input") ) {
- if (val[0]=='(') {
+ SendCommandSharedVision(posx, state, posy);
+ } else if (!strcmp(name, "input")) {
+ if (val[0] == '(') {
CclCommand(val);
} else {
HandleCheats(val);
}
- } else if( !strcmp(name,"quit") ) {
+ } else if (!strcmp(name, "quit")) {
CommandQuit(posx);
} else {
DebugLevel0Fn("Invalid name: %s" _C_ name);
}
- ReplayLog=gh_cdr(ReplayLog);
+ ReplayLog = gh_cdr(ReplayLog);
}
/**
@@ -628,32 +628,32 @@ local void DoNextReplay(void)
*/
local void ReplayEachCycle(void)
{
- if( InitReplay ) {
+ if (InitReplay) {
int i;
- for( i=0; i<PlayerMax; ++i ) {
- if( ReplayPlayers[i] ) {
+ for (i = 0; i < PlayerMax; ++i) {
+ if (ReplayPlayers[i]) {
PlayerSetName(&Players[i], ReplayPlayers[i]);
}
}
- InitReplay=0;
+ InitReplay = 0;
}
- if( gh_null_p(ReplayLog) ) {
+ if (gh_null_p(ReplayLog)) {
return;
}
- if( NextLogCycle!=~0UL && NextLogCycle!=GameCycle ) {
+ if (NextLogCycle != ~0UL && NextLogCycle != GameCycle) {
return;
}
do {
DoNextReplay();
- } while( !gh_null_p(ReplayLog)
- && (NextLogCycle==~0UL || NextLogCycle==GameCycle) );
+ } while (!gh_null_p(ReplayLog) &&
+ (NextLogCycle == ~0UL || NextLogCycle == GameCycle));
- if( gh_null_p(ReplayLog) ) {
+ if (gh_null_p(ReplayLog)) {
SetMessage("End of replay");
- GameObserve=0;
+ GameObserve = 0;
}
}
@@ -662,7 +662,7 @@ local void ReplayEachCycle(void)
*/
global void SinglePlayerReplayEachCycle(void)
{
- if( ReplayGameType==ReplaySinglePlayer ) {
+ if (ReplayGameType == ReplaySinglePlayer) {
ReplayEachCycle();
}
}
@@ -672,7 +672,7 @@ global void SinglePlayerReplayEachCycle(void)
*/
global void MultiPlayerReplayEachCycle(void)
{
- if( ReplayGameType==ReplayMultiPlayer ) {
+ if (ReplayGameType == ReplayMultiPlayer) {
ReplayEachCycle();
}
}
@@ -692,11 +692,11 @@ global void MultiPlayerReplayEachCycle(void)
*/
global void SendCommandStopUnit(Unit* unit)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("stop",unit,FlushCommands,-1,-1,NoUnitP,NULL,-1);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("stop", unit, FlushCommands, -1, -1, NoUnitP, NULL, -1);
CommandStopUnit(unit);
} else {
- NetworkSendCommand(MessageCommandStop,unit,0,0,NoUnitP,0,FlushCommands);
+ NetworkSendCommand(MessageCommandStop, unit, 0, 0, NoUnitP, 0, FlushCommands);
}
}
@@ -706,13 +706,13 @@ global void SendCommandStopUnit(Unit* unit)
** @param unit pointer to unit.
** @param flush Flag flush all pending commands.
*/
-global void SendCommandStandGround(Unit* unit,int flush)
+global void SendCommandStandGround(Unit* unit, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("stand-ground",unit,flush,-1,-1,NoUnitP,NULL,-1);
- CommandStandGround(unit,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("stand-ground", unit, flush, -1, -1, NoUnitP, NULL, -1);
+ CommandStandGround(unit, flush);
} else {
- NetworkSendCommand(MessageCommandStand,unit,0,0,NoUnitP,0,flush);
+ NetworkSendCommand(MessageCommandStand, unit, 0, 0, NoUnitP, 0, flush);
}
}
@@ -723,13 +723,13 @@ global void SendCommandStandGround(Unit* unit,int flush)
** @param dest follow this unit.
** @param flush Flag flush all pending commands.
*/
-global void SendCommandFollow(Unit* unit,Unit* dest,int flush)
+global void SendCommandFollow(Unit* unit, Unit* dest, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("follow",unit,flush,-1,-1,dest,NULL,-1);
- CommandFollow(unit,dest,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("follow", unit, flush, -1, -1, dest, NULL, -1);
+ CommandFollow(unit, dest, flush);
} else {
- NetworkSendCommand(MessageCommandFollow,unit,0,0,dest,0,flush);
+ NetworkSendCommand(MessageCommandFollow, unit, 0, 0, dest, 0, flush);
}
}
@@ -741,13 +741,13 @@ global void SendCommandFollow(Unit* unit,Unit* dest,int flush)
** @param y Y map tile position to move to.
** @param flush Flag flush all pending commands.
*/
-global void SendCommandMove(Unit* unit,int x,int y,int flush)
+global void SendCommandMove(Unit* unit, int x, int y, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("move",unit,flush,x,y,NoUnitP,NULL,-1);
- CommandMove(unit,x,y,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("move", unit, flush, x, y, NoUnitP, NULL, -1);
+ CommandMove(unit, x, y, flush);
} else {
- NetworkSendCommand(MessageCommandMove,unit,x,y,NoUnitP,0,flush);
+ NetworkSendCommand(MessageCommandMove, unit, x, y, NoUnitP, 0, flush);
}
}
@@ -760,13 +760,13 @@ global void SendCommandMove(Unit* unit,int x,int y,int flush)
** @param dest Unit to be repaired.
** @param flush Flag flush all pending commands.
*/
-global void SendCommandRepair(Unit* unit,int x,int y,Unit* dest,int flush)
+global void SendCommandRepair(Unit* unit, int x, int y, Unit* dest, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("repair",unit,flush,x,y,dest,NULL,-1);
- CommandRepair(unit,x,y,dest,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("repair", unit, flush, x, y, dest, NULL, -1);
+ CommandRepair(unit, x, y, dest, flush);
} else {
- NetworkSendCommand(MessageCommandRepair,unit,x,y,dest,0,flush);
+ NetworkSendCommand(MessageCommandRepair, unit, x, y, dest, 0, flush);
}
}
@@ -779,13 +779,13 @@ global void SendCommandRepair(Unit* unit,int x,int y,Unit* dest,int flush)
** @param attack or !=NoUnitP unit to be attacked.
** @param flush Flag flush all pending commands.
*/
-global void SendCommandAttack(Unit* unit,int x,int y,Unit* attack,int flush)
+global void SendCommandAttack(Unit* unit, int x, int y, Unit* attack, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("attack",unit,flush,x,y,attack,NULL,-1);
- CommandAttack(unit,x,y,attack,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("attack", unit, flush, x, y, attack, NULL, -1);
+ CommandAttack(unit, x, y, attack, flush);
} else {
- NetworkSendCommand(MessageCommandAttack,unit,x,y,attack,0,flush);
+ NetworkSendCommand(MessageCommandAttack, unit, x, y, attack, 0, flush);
}
}
@@ -797,13 +797,13 @@ global void SendCommandAttack(Unit* unit,int x,int y,Unit* attack,int flush)
** @param y Y map tile position to fire on.
** @param flush Flag flush all pending commands.
*/
-global void SendCommandAttackGround(Unit* unit,int x,int y,int flush)
+global void SendCommandAttackGround(Unit* unit, int x, int y, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("attack-ground",unit,flush,x,y,NoUnitP,NULL,-1);
- CommandAttackGround(unit,x,y,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("attack-ground", unit, flush, x, y, NoUnitP, NULL, -1);
+ CommandAttackGround(unit, x, y, flush);
} else {
- NetworkSendCommand(MessageCommandGround,unit,x,y,NoUnitP,0,flush);
+ NetworkSendCommand(MessageCommandGround, unit, x, y, NoUnitP, 0, flush);
}
}
@@ -815,13 +815,13 @@ global void SendCommandAttackGround(Unit* unit,int x,int y,int flush)
** @param y Y map tile position to patrol between.
** @param flush Flag flush all pending commands.
*/
-global void SendCommandPatrol(Unit* unit,int x,int y,int flush)
+global void SendCommandPatrol(Unit* unit, int x, int y, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("patrol",unit,flush,x,y,NoUnitP,NULL,-1);
- CommandPatrolUnit(unit,x,y,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("patrol", unit, flush, x, y, NoUnitP, NULL, -1);
+ CommandPatrolUnit(unit, x, y, flush);
} else {
- NetworkSendCommand(MessageCommandPatrol,unit,x,y,NoUnitP,0,flush);
+ NetworkSendCommand(MessageCommandPatrol, unit, x, y, NoUnitP, 0, flush);
}
}
@@ -834,13 +834,13 @@ global void SendCommandPatrol(Unit* unit,int x,int y,int flush)
** @param dest Destination to be boarded.
** @param flush Flag flush all pending commands.
*/
-global void SendCommandBoard(Unit* unit,int x,int y,Unit* dest,int flush)
+global void SendCommandBoard(Unit* unit, int x, int y, Unit* dest, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("board",unit,flush,x,y,dest,NULL,-1);
- CommandBoard(unit,dest,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("board", unit, flush, x, y, dest, NULL, -1);
+ CommandBoard(unit, dest, flush);
} else {
- NetworkSendCommand(MessageCommandBoard,unit,x,y,dest,0,flush);
+ NetworkSendCommand(MessageCommandBoard, unit, x, y, dest, 0, flush);
}
}
@@ -853,13 +853,13 @@ global void SendCommandBoard(Unit* unit,int x,int y,Unit* dest,int flush)
** @param what Passagier to be unloaded.
** @param flush Flag flush all pending commands.
*/
-global void SendCommandUnload(Unit* unit,int x,int y,Unit* what,int flush)
+global void SendCommandUnload(Unit* unit, int x, int y, Unit* what, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("unload",unit,flush,x,y,what,NULL,-1);
- CommandUnload(unit,x,y,what,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("unload", unit, flush, x, y, what, NULL, -1);
+ CommandUnload(unit, x, y, what, flush);
} else {
- NetworkSendCommand(MessageCommandUnload,unit,x,y,what,0,flush);
+ NetworkSendCommand(MessageCommandUnload, unit, x, y, what, 0, flush);
}
}
@@ -872,14 +872,14 @@ global void SendCommandUnload(Unit* unit,int x,int y,Unit* what,int flush)
** @param what pointer to unit-type of the building.
** @param flush Flag flush all pending commands.
*/
-global void SendCommandBuildBuilding(Unit* unit,int x,int y
- ,UnitType* what,int flush)
+global void SendCommandBuildBuilding(Unit* unit, int x, int y,
+ UnitType* what, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("build",unit,flush,x,y,NoUnitP,what->Ident,-1);
- CommandBuildBuilding(unit,x,y,what,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("build", unit, flush, x, y, NoUnitP, what->Ident, -1);
+ CommandBuildBuilding(unit, x, y, what, flush);
} else {
- NetworkSendCommand(MessageCommandBuild,unit,x,y,NoUnitP,what,flush);
+ NetworkSendCommand(MessageCommandBuild, unit, x, y, NoUnitP, what, flush);
}
}
@@ -889,15 +889,15 @@ global void SendCommandBuildBuilding(Unit* unit,int x,int y
** @param unit pointer to unit.
** @param worker Worker which should stop.
*/
-global void SendCommandCancelBuilding(Unit* unit,Unit* worker)
+global void SendCommandCancelBuilding(Unit* unit, Unit* worker)
{
// FIXME: currently unit and worker are same?
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("cancel-build",unit,FlushCommands,-1,-1,worker,NULL,-1);
- CommandCancelBuilding(unit,worker);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("cancel-build", unit, FlushCommands, -1, -1, worker, NULL, -1);
+ CommandCancelBuilding(unit, worker);
} else {
- NetworkSendCommand(MessageCommandCancelBuild,unit,0,0,worker,0
- ,FlushCommands);
+ NetworkSendCommand(MessageCommandCancelBuild, unit, 0, 0, worker, 0,
+ FlushCommands);
}
}
@@ -909,13 +909,13 @@ global void SendCommandCancelBuilding(Unit* unit,Unit* worker)
** @param y Y map tile position where to harvest.
** @param flush Flag flush all pending commands.
*/
-global void SendCommandResourceLoc(Unit* unit,int x,int y,int flush)
+global void SendCommandResourceLoc(Unit* unit, int x, int y, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("resource-loc",unit,flush,x,y,NoUnitP,NULL,-1);
- CommandResourceLoc(unit,x,y,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("resource-loc", unit, flush, x, y, NoUnitP, NULL, -1);
+ CommandResourceLoc(unit, x, y, flush);
} else {
- NetworkSendCommand(MessageCommandResourceLoc,unit,x,y,NoUnitP,0,flush);
+ NetworkSendCommand(MessageCommandResourceLoc, unit, x, y, NoUnitP, 0, flush);
}
}
@@ -926,13 +926,13 @@ global void SendCommandResourceLoc(Unit* unit,int x,int y,int flush)
** @param dest pointer to destination (oil-platform,gold mine).
** @param flush Flag flush all pending commands.
*/
-global void SendCommandResource(Unit* unit,Unit* dest,int flush)
+global void SendCommandResource(Unit* unit, Unit* dest, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("resource",unit,flush,-1,-1,dest,NULL,-1);
- CommandResource(unit,dest,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("resource", unit, flush, -1, -1, dest, NULL, -1);
+ CommandResource(unit, dest, flush);
} else {
- NetworkSendCommand(MessageCommandResource,unit,0,0,dest,0,flush);
+ NetworkSendCommand(MessageCommandResource, unit, 0, 0, dest, 0, flush);
}
}
@@ -943,13 +943,13 @@ global void SendCommandResource(Unit* unit,Unit* dest,int flush)
** @param goal pointer to destination of the goods. (NULL=search best)
** @param flush Flag flush all pending commands.
*/
-global void SendCommandReturnGoods(Unit* unit,Unit* goal,int flush)
+global void SendCommandReturnGoods(Unit* unit, Unit* goal, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("return",unit,flush,-1,-1,goal,NULL,-1);
- CommandReturnGoods(unit,goal,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("return", unit, flush, -1, -1, goal, NULL, -1);
+ CommandReturnGoods(unit, goal, flush);
} else {
- NetworkSendCommand(MessageCommandReturn,unit,0,0,goal,0,flush);
+ NetworkSendCommand(MessageCommandReturn, unit, 0, 0, goal, 0, flush);
}
}
@@ -960,13 +960,13 @@ global void SendCommandReturnGoods(Unit* unit,Unit* goal,int flush)
** @param what pointer to unit-type of the unit to be trained.
** @param flush Flag flush all pending commands.
*/
-global void SendCommandTrainUnit(Unit* unit,UnitType* what,int flush)
+global void SendCommandTrainUnit(Unit* unit, UnitType* what, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("train",unit,flush,-1,-1,NoUnitP,what->Ident,-1);
- CommandTrainUnit(unit,what,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("train", unit, flush, -1, -1, NoUnitP, what->Ident, -1);
+ CommandTrainUnit(unit, what, flush);
} else {
- NetworkSendCommand(MessageCommandTrain,unit,0,0,NoUnitP,what,flush);
+ NetworkSendCommand(MessageCommandTrain, unit, 0, 0, NoUnitP, what, flush);
}
}
@@ -977,15 +977,15 @@ global void SendCommandTrainUnit(Unit* unit,UnitType* what,int flush)
** @param slot Slot of training queue to cancel.
** @param type Unit-type of unit to cancel.
*/
-global void SendCommandCancelTraining(Unit* unit,int slot,const UnitType* type)
+global void SendCommandCancelTraining(Unit* unit, int slot, const UnitType* type)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("cancel-train",unit,FlushCommands,-1,-1,NoUnitP,
- type ? type->Ident : NULL,slot);
- CommandCancelTraining(unit,slot,type);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("cancel-train", unit, FlushCommands, -1, -1, NoUnitP,
+ type ? type->Ident : NULL, slot);
+ CommandCancelTraining(unit, slot, type);
} else {
- NetworkSendCommand(MessageCommandCancelTrain,unit,slot,0,NoUnitP,type
- ,FlushCommands);
+ NetworkSendCommand(MessageCommandCancelTrain, unit, slot, 0, NoUnitP,
+ type, FlushCommands);
}
}
@@ -996,13 +996,13 @@ global void SendCommandCancelTraining(Unit* unit,int slot,const UnitType* type)
** @param what pointer to unit-type of the unit upgrade.
** @param flush Flag flush all pending commands.
*/
-global void SendCommandUpgradeTo(Unit* unit,UnitType* what,int flush)
+global void SendCommandUpgradeTo(Unit* unit, UnitType* what, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("upgrade-to",unit,flush,-1,-1,NoUnitP,what->Ident,-1);
- CommandUpgradeTo(unit,what,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("upgrade-to", unit, flush, -1, -1, NoUnitP, what->Ident, -1);
+ CommandUpgradeTo(unit, what, flush);
} else {
- NetworkSendCommand(MessageCommandUpgrade,unit,0,0,NoUnitP,what,flush);
+ NetworkSendCommand(MessageCommandUpgrade, unit, 0, 0, NoUnitP, what, flush);
}
}
@@ -1013,13 +1013,13 @@ global void SendCommandUpgradeTo(Unit* unit,UnitType* what,int flush)
*/
global void SendCommandCancelUpgradeTo(Unit* unit)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("cancel-upgrade-to",unit,FlushCommands
- ,-1,-1,NoUnitP,NULL,-1);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("cancel-upgrade-to", unit, FlushCommands,
+ -1, -1, NoUnitP, NULL, -1);
CommandCancelUpgradeTo(unit);
} else {
- NetworkSendCommand(MessageCommandCancelUpgrade,unit
- ,0,0,NoUnitP,NULL,FlushCommands);
+ NetworkSendCommand(MessageCommandCancelUpgrade, unit,
+ 0, 0, NoUnitP, NULL, FlushCommands);
}
}
@@ -1030,14 +1030,14 @@ global void SendCommandCancelUpgradeTo(Unit* unit)
** @param what research-type of the research.
** @param flush Flag flush all pending commands.
*/
-global void SendCommandResearch(Unit* unit,Upgrade* what,int flush)
+global void SendCommandResearch(Unit* unit, Upgrade* what, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("research",unit,flush,-1,-1,NoUnitP,what->Ident,-1);
- CommandResearch(unit,what,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("research", unit, flush, -1, -1, NoUnitP, what->Ident, -1);
+ CommandResearch(unit, what, flush);
} else {
- NetworkSendCommand(MessageCommandResearch,unit
- ,what-Upgrades,0,NoUnitP,NULL,flush);
+ NetworkSendCommand(MessageCommandResearch, unit,
+ what-Upgrades, 0, NoUnitP, NULL, flush);
}
}
@@ -1048,12 +1048,12 @@ global void SendCommandResearch(Unit* unit,Upgrade* what,int flush)
*/
global void SendCommandCancelResearch(Unit* unit)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("cancel-research",unit,FlushCommands,-1,-1,NoUnitP,NULL,-1);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("cancel-research", unit, FlushCommands, -1, -1, NoUnitP, NULL, -1);
CommandCancelResearch(unit);
} else {
- NetworkSendCommand(MessageCommandCancelResearch,unit
- ,0,0,NoUnitP,NULL,FlushCommands);
+ NetworkSendCommand(MessageCommandCancelResearch, unit,
+ 0, 0, NoUnitP, NULL, FlushCommands);
}
}
@@ -1066,13 +1066,13 @@ global void SendCommandCancelResearch(Unit* unit)
** @param attack or !=NoUnitP unit to be demolished.
** @param flush Flag flush all pending commands.
*/
-global void SendCommandDemolish(Unit* unit,int x,int y,Unit* attack,int flush)
+global void SendCommandDemolish(Unit* unit, int x, int y, Unit* attack, int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("demolish",unit,flush,x,y,attack,NULL,-1);
- CommandDemolish(unit,x,y,attack,flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("demolish", unit, flush, x, y, attack, NULL, -1);
+ CommandDemolish(unit, x, y, attack, flush);
} else {
- NetworkSendCommand(MessageCommandDemolish,unit,x,y,attack,NULL,flush);
+ NetworkSendCommand(MessageCommandDemolish, unit, x, y, attack, NULL, flush);
}
}
@@ -1086,15 +1086,15 @@ global void SendCommandDemolish(Unit* unit,int x,int y,Unit* attack,int flush)
** @param spellid Spell type id.
** @param flush Flag flush all pending commands.
*/
-global void SendCommandSpellCast(Unit* unit,int x,int y,Unit* dest,int spellid
- ,int flush)
+global void SendCommandSpellCast(Unit* unit, int x, int y, Unit* dest, int spellid,
+ int flush)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("spell-cast",unit,flush,x,y,dest,NULL,spellid);
- CommandSpellCast(unit,x,y,dest,SpellTypeById(spellid),flush);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("spell-cast", unit, flush, x, y, dest, NULL, spellid);
+ CommandSpellCast(unit, x, y, dest, SpellTypeById(spellid), flush);
} else {
- NetworkSendCommand(MessageCommandSpellCast+spellid
- ,unit,x,y,dest,NULL,flush);
+ NetworkSendCommand(MessageCommandSpellCast + spellid,
+ unit, x, y, dest, NULL, flush);
}
}
@@ -1105,15 +1105,15 @@ global void SendCommandSpellCast(Unit* unit,int x,int y,Unit* dest,int spellid
** @param spellid Spell type id.
** @param on 1 for auto cast on, 0 for off.
*/
-global void SendCommandAutoSpellCast(Unit* unit,int spellid,int on)
+global void SendCommandAutoSpellCast(Unit* unit, int spellid, int on)
{
- if( NetworkFildes==(Socket)-1 ) {
- CommandLog("auto-spell-cast",unit,FlushCommands,on,-1,NoUnitP
- ,NULL,spellid);
- CommandAutoSpellCast(unit,on?SpellTypeById(spellid):NULL);
+ if (NetworkFildes == (Socket)-1) {
+ CommandLog("auto-spell-cast", unit, FlushCommands, on, -1, NoUnitP,
+ NULL, spellid);
+ CommandAutoSpellCast(unit, on ? SpellTypeById(spellid) : NULL);
} else {
- NetworkSendCommand(MessageCommandSpellCast+spellid
- ,unit,on,-1,NoUnitP,NULL,FlushCommands);
+ NetworkSendCommand(MessageCommandSpellCast + spellid,
+ unit, on, -1, NoUnitP, NULL, FlushCommands);
}
}
@@ -1124,31 +1124,31 @@ global void SendCommandAutoSpellCast(Unit* unit,int spellid,int on)
** @param state New diplomacy state.
** @param opponent Opponent.
*/
-global void SendCommandDiplomacy(int player,int state,int opponent)
+global void SendCommandDiplomacy(int player, int state, int opponent)
{
- if( NetworkFildes==(Socket)-1 ) {
- switch( state ) {
+ if (NetworkFildes == (Socket)-1) {
+ switch (state) {
case DiplomacyNeutral:
- CommandLog("diplomacy",NoUnitP,0,player,opponent,
- NoUnitP,"neutral",-1);
+ CommandLog("diplomacy", NoUnitP, 0, player, opponent,
+ NoUnitP, "neutral", -1);
break;
case DiplomacyAllied:
- CommandLog("diplomacy",NoUnitP,0,player,opponent,
- NoUnitP,"allied",-1);
+ CommandLog("diplomacy", NoUnitP, 0, player, opponent,
+ NoUnitP, "allied", -1);
break;
case DiplomacyEnemy:
- CommandLog("diplomacy",NoUnitP,0,player,opponent,
- NoUnitP,"enemy",-1);
+ CommandLog("diplomacy", NoUnitP, 0, player, opponent,
+ NoUnitP, "enemy", -1);
break;
case DiplomacyCrazy:
- CommandLog("diplomacy",NoUnitP,0,player,opponent,
- NoUnitP,"crazy",-1);
+ CommandLog("diplomacy", NoUnitP, 0, player, opponent,
+ NoUnitP, "crazy", -1);
break;
}
- CommandDiplomacy(player,state,opponent);
+ CommandDiplomacy(player, state, opponent);
} else {
NetworkSendExtendedCommand(ExtendedMessageDiplomacy,
- -1,player,state,opponent,0);
+ -1, player, state, opponent, 0);
}
}
@@ -1159,20 +1159,20 @@ global void SendCommandDiplomacy(int player,int state,int opponent)
** @param state New shared vision state.
** @param opponent Opponent.
*/
-global void SendCommandSharedVision(int player,int state,int opponent)
+global void SendCommandSharedVision(int player, int state, int opponent)
{
- if( NetworkFildes==(Socket)-1 ) {
- if( state==0 ) {
- CommandLog("shared-vision",NoUnitP,0,player,opponent,
- NoUnitP,"0",-1);
+ if (NetworkFildes == (Socket)-1) {
+ if (state==0) {
+ CommandLog("shared-vision", NoUnitP, 0, player, opponent,
+ NoUnitP, "0", -1);
} else {
- CommandLog("shared-vision",NoUnitP,0,player,opponent,
- NoUnitP,"1",-1);
+ CommandLog("shared-vision", NoUnitP, 0, player, opponent,
+ NoUnitP, "1", -1);
}
- CommandSharedVision(player,state,opponent);
+ CommandSharedVision(player, state, opponent);
} else {
NetworkSendExtendedCommand(ExtendedMessageSharedVision,
- -1,player,state,opponent,0);
+ -1, player, state, opponent, 0);
}
}
@@ -1194,8 +1194,8 @@ global void SendCommandSharedVision(int player,int state,int opponent)
** @param y optional y map position.
** @param dstnr optional destination unit.
*/
-global void ParseCommand(unsigned char msgnr,UnitRef unum,
- unsigned short x,unsigned short y,UnitRef dstnr)
+global void ParseCommand(unsigned char msgnr, UnitRef unum,
+ unsigned short x, unsigned short y, UnitRef dstnr)
{
Unit* unit;
Unit* dest;
@@ -1204,23 +1204,23 @@ global void ParseCommand(unsigned char msgnr,UnitRef unum,
DebugLevel3Fn(" %d cycle %lu\n" _C_ msgnr _C_ GameCycle);
- unit=UnitSlots[unum];
- DebugCheck( !unit );
+ unit = UnitSlots[unum];
+ DebugCheck(!unit);
//
// Check if unit is already killed?
//
- if( unit->Destroyed ) {
+ if (unit->Destroyed) {
DebugLevel0Fn(" destroyed unit skipping %d\n" _C_ UnitNumber(unit));
return;
}
- DebugCheck( !unit->Type );
+ DebugCheck(!unit->Type);
- status=(msgnr&0x80)>>7;
+ status = (msgnr & 0x80) >> 7;
// Note: destroyed destination unit is handled by the action routines.
- switch( msgnr&0x7F ) {
+ switch (msgnr & 0x7F) {
case MessageSync:
return;
case MessageQuit:
@@ -1229,166 +1229,166 @@ global void ParseCommand(unsigned char msgnr,UnitRef unum,
return;
case MessageCommandStop:
- CommandLog("stop",unit,FlushCommands,-1,-1,NoUnitP,NULL,-1);
+ CommandLog("stop", unit, FlushCommands, -1, -1, NoUnitP, NULL, -1);
CommandStopUnit(unit);
break;
case MessageCommandStand:
- CommandLog("stand-ground",unit,status,-1,-1,NoUnitP,NULL,-1);
- CommandStandGround(unit,status);
+ CommandLog("stand-ground", unit, status, -1, -1, NoUnitP, NULL, -1);
+ CommandStandGround(unit, status);
break;
case MessageCommandFollow:
- dest=NoUnitP;
- if( dstnr!=(unsigned short)0xFFFF ) {
- dest=UnitSlots[dstnr];
- DebugCheck( !dest || !dest->Type );
+ dest = NoUnitP;
+ if (dstnr != (unsigned short)0xFFFF) {
+ dest = UnitSlots[dstnr];
+ DebugCheck(!dest || !dest->Type);
}
- CommandLog("follow",unit,status,-1,-1,dest,NULL,-1);
- CommandFollow(unit,dest,status);
+ CommandLog("follow", unit, status, -1, -1, dest, NULL, -1);
+ CommandFollow(unit, dest, status);
break;
case MessageCommandMove:
- CommandLog("move",unit,status,x,y,NoUnitP,NULL,-1);
- CommandMove(unit,x,y,status);
+ CommandLog("move", unit, status, x, y, NoUnitP, NULL, -1);
+ CommandMove(unit, x, y, status);
break;
case MessageCommandRepair:
- dest=NoUnitP;
- if( dstnr!=(unsigned short)0xFFFF ) {
- dest=UnitSlots[dstnr];
- DebugCheck( !dest || !dest->Type );
+ dest = NoUnitP;
+ if (dstnr != (unsigned short)0xFFFF) {
+ dest = UnitSlots[dstnr];
+ DebugCheck(!dest || !dest->Type);
}
- CommandLog("repair",unit,status,x,y,dest,NULL,-1);
- CommandRepair(unit,x,y,dest,status);
+ CommandLog("repair", unit, status, x, y, dest, NULL, -1);
+ CommandRepair(unit, x, y, dest, status);
break;
case MessageCommandAttack:
- dest=NoUnitP;
- if( dstnr!=(unsigned short)0xFFFF ) {
- dest=UnitSlots[dstnr];
- DebugCheck( !dest || !dest->Type );
+ dest = NoUnitP;
+ if (dstnr != (unsigned short)0xFFFF) {
+ dest = UnitSlots[dstnr];
+ DebugCheck(!dest || !dest->Type);
}
- CommandLog("attack",unit,status,x,y,dest,NULL,-1);
- CommandAttack(unit,x,y,dest,status);
+ CommandLog("attack", unit, status, x, y, dest, NULL, -1);
+ CommandAttack(unit, x, y, dest, status);
break;
case MessageCommandGround:
- CommandLog("attack-ground",unit,status,x,y,NoUnitP,NULL,-1);
- CommandAttackGround(unit,x,y,status);
+ CommandLog("attack-ground", unit, status, x, y, NoUnitP, NULL, -1);
+ CommandAttackGround(unit, x, y, status);
break;
case MessageCommandPatrol:
- CommandLog("patrol",unit,status,x,y,NoUnitP,NULL,-1);
- CommandPatrolUnit(unit,x,y,status);
+ CommandLog("patrol", unit, status, x, y, NoUnitP, NULL, -1);
+ CommandPatrolUnit(unit, x, y, status);
break;
case MessageCommandBoard:
- dest=NoUnitP;
- if( dstnr!=(unsigned short)0xFFFF ) {
- dest=UnitSlots[dstnr];
- DebugCheck( !dest || !dest->Type );
+ dest = NoUnitP;
+ if (dstnr != (unsigned short)0xFFFF) {
+ dest = UnitSlots[dstnr];
+ DebugCheck(!dest || !dest->Type);
}
- CommandLog("board",unit,status,x,y,dest,NULL,-1);
- CommandBoard(unit,dest,status);
+ CommandLog("board", unit, status, x, y, dest, NULL, -1);
+ CommandBoard(unit, dest, status);
break;
case MessageCommandUnload:
- dest=NoUnitP;
- if( dstnr!=(unsigned short)0xFFFF ) {
- dest=UnitSlots[dstnr];
- DebugCheck( !dest || !dest->Type );
+ dest = NoUnitP;
+ if (dstnr != (unsigned short)0xFFFF) {
+ dest = UnitSlots[dstnr];
+ DebugCheck(!dest || !dest->Type);
}
- CommandLog("unload",unit,status,x,y,dest,NULL,-1);
- CommandUnload(unit,x,y,dest,status);
+ CommandLog("unload", unit, status, x, y, dest, NULL, -1);
+ CommandUnload(unit, x, y, dest, status);
break;
case MessageCommandBuild:
- CommandLog("build",unit,status,x,y,NoUnitP,UnitTypes[dstnr]->Ident,
- -1);
- CommandBuildBuilding(unit,x,y,UnitTypes[dstnr],status);
+ CommandLog("build", unit, status, x, y, NoUnitP, UnitTypes[dstnr]->Ident,
+ -1);
+ CommandBuildBuilding(unit, x, y, UnitTypes[dstnr], status);
break;
case MessageCommandCancelBuild:
// dest is the worker building the unit...
- dest=NoUnitP;
- if( dstnr!=(unsigned short)0xFFFF ) {
- dest=UnitSlots[dstnr];
- DebugCheck( !dest || !dest->Type );
+ dest = NoUnitP;
+ if (dstnr != (unsigned short)0xFFFF) {
+ dest = UnitSlots[dstnr];
+ DebugCheck(!dest || !dest->Type);
}
- CommandLog("cancel-build",unit,FlushCommands,-1,-1,dest,NULL,-1);
- CommandCancelBuilding(unit,dest);
+ CommandLog("cancel-build", unit, FlushCommands, -1, -1, dest, NULL, -1);
+ CommandCancelBuilding(unit, dest);
break;
case MessageCommandResourceLoc:
- CommandLog("resource-loc",unit,status,x,y,NoUnitP,NULL,-1);
- CommandResourceLoc(unit,x,y,status);
+ CommandLog("resource-loc", unit, status, x, y, NoUnitP, NULL, -1);
+ CommandResourceLoc(unit, x, y, status);
break;
case MessageCommandResource:
- dest=NoUnitP;
- if( dstnr!=(unsigned short)0xFFFF ) {
- dest=UnitSlots[dstnr];
- DebugCheck( !dest || !dest->Type );
+ dest = NoUnitP;
+ if (dstnr != (unsigned short)0xFFFF) {
+ dest = UnitSlots[dstnr];
+ DebugCheck(!dest || !dest->Type);
}
- CommandLog("resource",unit,status,-1,-1,dest,NULL,-1);
- CommandResource(unit,dest,status);
+ CommandLog("resource", unit, status, -1, -1, dest, NULL, -1);
+ CommandResource(unit, dest, status);
break;
case MessageCommandReturn:
- dest=NoUnitP;
- if( dstnr!=(unsigned short)0xFFFF ) {
- dest=UnitSlots[dstnr];
- DebugCheck( !dest || !dest->Type );
+ dest = NoUnitP;
+ if (dstnr != (unsigned short)0xFFFF) {
+ dest = UnitSlots[dstnr];
+ DebugCheck(!dest || !dest->Type);
}
- CommandLog("return",unit,status,-1,-1,dest,NULL,-1);
- CommandReturnGoods(unit,dest,status);
+ CommandLog("return", unit, status, -1, -1, dest, NULL, -1);
+ CommandReturnGoods(unit, dest, status);
break;
case MessageCommandTrain:
- CommandLog("train",unit,status,-1,-1,NoUnitP
- ,UnitTypes[dstnr]->Ident,-1);
- CommandTrainUnit(unit,UnitTypes[dstnr],status);
+ CommandLog("train", unit, status, -1, -1, NoUnitP,
+ UnitTypes[dstnr]->Ident, -1);
+ CommandTrainUnit(unit, UnitTypes[dstnr], status);
break;
case MessageCommandCancelTrain:
// We need (short)x for the last slot -1
- if( dstnr!=(unsigned short)0xFFFF ) {
- CommandLog("cancel-train",unit,FlushCommands,-1,-1,NoUnitP,
- UnitTypes[dstnr]->Ident,(short)x);
- CommandCancelTraining(unit,(short)x,UnitTypes[dstnr]);
+ if (dstnr != (unsigned short)0xFFFF) {
+ CommandLog("cancel-train", unit, FlushCommands, -1, -1, NoUnitP,
+ UnitTypes[dstnr]->Ident, (short)x);
+ CommandCancelTraining(unit, (short)x, UnitTypes[dstnr]);
} else {
- CommandLog("cancel-train",unit,FlushCommands,-1,-1,NoUnitP,
- NULL,(short)x);
- CommandCancelTraining(unit,(short)x,NULL);
+ CommandLog("cancel-train", unit, FlushCommands, -1, -1, NoUnitP,
+ NULL, (short)x);
+ CommandCancelTraining(unit, (short)x, NULL);
}
break;
case MessageCommandUpgrade:
- CommandLog("upgrade-to",unit,status,-1,-1,NoUnitP
- ,UnitTypes[dstnr]->Ident,-1);
- CommandUpgradeTo(unit,UnitTypes[dstnr],status);
+ CommandLog("upgrade-to", unit, status, -1, -1, NoUnitP,
+ UnitTypes[dstnr]->Ident, -1);
+ CommandUpgradeTo(unit, UnitTypes[dstnr], status);
break;
case MessageCommandCancelUpgrade:
- CommandLog("cancel-upgrade-to",unit,FlushCommands,-1,-1,NoUnitP
- ,NULL,-1);
+ CommandLog("cancel-upgrade-to", unit, FlushCommands, -1, -1, NoUnitP,
+ NULL, -1);
CommandCancelUpgradeTo(unit);
break;
case MessageCommandResearch:
- CommandLog("research",unit,status,-1,-1,NoUnitP
- ,Upgrades[x].Ident,-1);
- CommandResearch(unit,Upgrades+x,status);
+ CommandLog("research", unit, status, -1, -1, NoUnitP,
+ Upgrades[x].Ident, -1);
+ CommandResearch(unit,Upgrades+x, status);
break;
case MessageCommandCancelResearch:
- CommandLog("cancel-research",unit,FlushCommands,-1,-1,NoUnitP
- ,NULL,-1);
+ CommandLog("cancel-research", unit, FlushCommands, -1, -1, NoUnitP,
+ NULL, -1);
CommandCancelResearch(unit);
break;
case MessageCommandDemolish:
- dest=NoUnitP;
- if( dstnr!=(unsigned short)0xFFFF ) {
- dest=UnitSlots[dstnr];
- DebugCheck( !dest || !dest->Type );
+ dest = NoUnitP;
+ if (dstnr != (unsigned short)0xFFFF) {
+ dest = UnitSlots[dstnr];
+ DebugCheck(!dest || !dest->Type);
}
- CommandLog("demolish",unit,status,x,y,dest,NULL,-1);
- CommandDemolish(unit,x,y,dest,status);
+ CommandLog("demolish", unit, status, x, y, dest, NULL, -1);
+ CommandDemolish(unit, x, y, dest, status);
break;
default:
id = (msgnr&0x7f) - MessageCommandSpellCast;
- if( y!=(unsigned short)0xFFFF ) {
- dest=NoUnitP;
- if( dstnr!=(unsigned short)0xFFFF ) {
- dest=UnitSlots[dstnr];
- DebugCheck( !dest || !dest->Type );
+ if (y != (unsigned short)0xFFFF) {
+ dest = NoUnitP;
+ if (dstnr != (unsigned short)0xFFFF) {
+ dest = UnitSlots[dstnr];
+ DebugCheck(!dest || !dest->Type);
}
- CommandLog("spell-cast",unit,status,x,y,dest,NULL,id);
- CommandSpellCast(unit,x,y,dest,SpellTypeById(id),status);
+ CommandLog("spell-cast", unit, status, x, y, dest, NULL, id);
+ CommandSpellCast(unit, x, y, dest, SpellTypeById(id), status);
} else {
- CommandLog("auto-spell-cast",unit,status,x,-1,NoUnitP,NULL,id);
- CommandAutoSpellCast(unit,x?SpellTypeById(id):NULL);
+ CommandLog("auto-spell-cast", unit, status,x, -1, NoUnitP, NULL, id);
+ CommandAutoSpellCast(unit, x ? SpellTypeById(id) : NULL);
}
break;
}
@@ -1404,50 +1404,50 @@ global void ParseCommand(unsigned char msgnr,UnitRef unum,
** @param arg3 Messe argument 3
** @param arg4 Messe argument 4
*/
-global void ParseExtendedCommand(unsigned char type,int status,
- unsigned char arg1, unsigned short arg2, unsigned short arg3,
- unsigned short arg4)
+global void ParseExtendedCommand(unsigned char type, int status,
+ unsigned char arg1, unsigned short arg2, unsigned short arg3,
+ unsigned short arg4)
{
DebugLevel3Fn(" %d cycle %lu\n" _C_ type _C_ GameCycle);
// Note: destroyed units are handled by the action routines.
- switch( type ) {
+ switch (type) {
case ExtendedMessageDiplomacy:
- switch( arg3 ) {
+ switch (arg3) {
case DiplomacyNeutral:
- CommandLog("diplomacy",NoUnitP,0,arg2,arg4,
- NoUnitP,"neutral",-1);
+ CommandLog("diplomacy", NoUnitP, 0, arg2, arg4,
+ NoUnitP, "neutral", -1);
break;
case DiplomacyAllied:
- CommandLog("diplomacy",NoUnitP,0,arg2,arg4,
- NoUnitP,"allied",-1);
+ CommandLog("diplomacy", NoUnitP, 0, arg2, arg4,
+ NoUnitP, "allied", -1);
break;
case DiplomacyEnemy:
- CommandLog("diplomacy",NoUnitP,0,arg2,arg4,
- NoUnitP,"enemy",-1);
+ CommandLog("diplomacy", NoUnitP, 0, arg2, arg4,
+ NoUnitP, "enemy", -1);
break;
case DiplomacyCrazy:
- CommandLog("diplomacy",NoUnitP,0,arg2,arg4,
- NoUnitP,"crazy",-1);
+ CommandLog("diplomacy", NoUnitP, 0, arg2, arg4,
+ NoUnitP, "crazy", -1);
break;
}
CommandDiplomacy(arg2,arg3,arg4);
break;
case ExtendedMessageSharedVision:
- if( arg3==0 ) {
- CommandLog("shared-vision",NoUnitP,0,arg2,arg4,
- NoUnitP,"0",-1);
+ if (arg3 == 0) {
+ CommandLog("shared-vision", NoUnitP, 0, arg2, arg4,
+ NoUnitP, "0", -1);
} else {
- CommandLog("shared-vision",NoUnitP,0,arg2,arg4,
- NoUnitP,"1",-1);
+ CommandLog("shared-vision", NoUnitP, 0, arg2, arg4,
+ NoUnitP, "1", -1);
}
- CommandSharedVision(arg2,arg3,arg4);
+ CommandSharedVision(arg2, arg3, arg4);
break;
default:
DebugLevel0Fn("Unknown extended message %u/%s %u %u %u %u\n" _C_
- type _C_ status ? "flush" : "-"
- _C_ arg1 _C_ arg2 _C_ arg3 _C_ arg4);
+ type _C_ status ? "flush" : "-" _C_
+ arg1 _C_ arg2 _C_ arg3 _C_ arg4);
break;
}
}