Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Nameing cleanups

Browse source
This commit is contained in:
ariclone 2002-12-16 20:50:38 +00:00
parent 316e766d04
commit a9010453f7
4 changed files with 72 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/include/freecraft.h
View file

@ -306,6 +306,9 @@
#define FreeCraftFormatArgs(v) (v)/10000,((v)/100)%100,(v)%100
#endif
/// Text string: Name, Version, Copyright
extern char NameLine[];
#ifndef FREECRAFT_LIB_PATH
#define FREECRAFT_LIB_PATH "data" /// Where to find the data files
#endif

5
src/include/menus.h
View file

@ -252,8 +252,9 @@ typedef struct _menus_ {
extern int GuiGameStarted; /// Game Started?
extern Menu *CurrentMenu; /// Currently processed menu
extern char ScenSelectFullPath[1024]; /// Full path to currently selected map
extern MapInfo *ScenSelectMapInfo; /// MapInfo of currently selected map
extern MapInfo *MenuMapInfo; /// MapInfo of map used in gui menus
extern char MenuMapFullPath[1024]; /// Full path to currently selected map
extern int nKeyStrokeHelps; /// Number of loaded keystroke helps
extern char **KeyStrokeHelps; /// Keystroke help pairs

44
src/network/netconnect.cpp
View file

@ -345,7 +345,7 @@ global void NetworkServerStartGame(void)
// Make a list of the available player slots.
for (h = i = 0; i < PlayerMax; i++) {
if (ScenSelectMapInfo->PlayerType[i] == PlayerPerson) {
if (MenuMapInfo->PlayerType[i] == PlayerPerson) {
rev[i] = h;
num[h++] = i;
DebugLevel0Fn("Slot %d is available for an interactive player (%d)\n" _C_ i _C_ rev[i]);
@ -354,15 +354,15 @@ global void NetworkServerStartGame(void)
// Make a list of the available computer slots.
n = h;
for (i = 0; i < PlayerMax; i++) {
if (ScenSelectMapInfo->PlayerType[i] == PlayerComputer) {
if (MenuMapInfo->PlayerType[i] == PlayerComputer) {
rev[i] = n++;
DebugLevel0Fn("Slot %d is available for an ai computer player (%d)\n" _C_ i _C_ rev[i]);
}
}
// Make a list of the remaining slots.
for (i = 0; i < PlayerMax; i++) {
if (ScenSelectMapInfo->PlayerType[i] != PlayerPerson &&
ScenSelectMapInfo->PlayerType[i] != PlayerComputer) {
if (MenuMapInfo->PlayerType[i] != PlayerPerson &&
MenuMapInfo->PlayerType[i] != PlayerComputer) {
rev[i] = n++;
// PlayerNobody - not available to anything..
}
@ -481,7 +481,7 @@ global void NetworkServerStartGame(void)
message.Type = MessageInitReply;
message.SubType = ICMConfig;
message.HostsCount = NetPlayers;
message.MapUID = htonl(ScenSelectMapInfo->MapUID);
message.MapUID = htonl(MenuMapInfo->MapUID);
for (i = 0; i < NetPlayers; ++i) {
message.u.Hosts[i].Host = Hosts[i].Host;
message.u.Hosts[i].Port = Hosts[i].Port;
@ -494,7 +494,7 @@ global void NetworkServerStartGame(void)
statemsg.SubType = ICMState;
statemsg.HostsCount = NetPlayers;
statemsg.u.State = ServerSetupState;
statemsg.MapUID = htonl(ScenSelectMapInfo->MapUID);
statemsg.MapUID = htonl(MenuMapInfo->MapUID);
msg = (InitMessage *)buf;
DebugLevel1Fn("Ready, sending InitConfig to %d host(s)\n" _C_ HostsCount);
@ -668,7 +668,7 @@ changed:
message.Type = MessageInitHello;
message.SubType = ICMState;
message.u.State = LocalSetupState;
message.MapUID = htonl(ScenSelectMapInfo->MapUID);
message.MapUID = htonl(MenuMapInfo->MapUID);
NetworkSendRateLimitedClientMessage(&message, 450);
} else {
NetLocalState = ccs_unreachable;
@ -688,10 +688,10 @@ changed:
}
break;
case ccs_mapinfo:
if (NetStateMsgCnt < 20 && ScenSelectMapInfo != NULL) { // 20 retries
if (NetStateMsgCnt < 20 && MenuMapInfo != NULL) { // 20 retries
message.Type = MessageInitHello;
message.SubType = ICMMap; // ICMMapAck..
message.MapUID = htonl(ScenSelectMapInfo->MapUID);
message.MapUID = htonl(MenuMapInfo->MapUID);
NetworkSendRateLimitedClientMessage(&message, 650);
} else {
NetLocalState = ccs_unreachable;
@ -702,8 +702,8 @@ changed:
if (NetStateMsgCnt < 20) { // 20 retries
message.Type = MessageInitHello;
message.SubType = ICMMapUidMismatch;
if (ScenSelectMapInfo) {
message.MapUID = htonl(ScenSelectMapInfo->MapUID); // MAP Uid doesn't match
if (MenuMapInfo) {
message.MapUID = htonl(MenuMapInfo->MapUID); // MAP Uid doesn't match
} else {
message.MapUID = 0L; // Map not found
}
@ -776,7 +776,7 @@ global void NetworkProcessServerRequest(void)
unsigned long fcd;
InitMessage message;
if (ScenSelectMapInfo == NULL) {
if (MenuMapInfo == NULL) {
return;
// Game already started...
}
@ -922,18 +922,18 @@ local void ClientParseConnected(const InitMessage* msg)
switch(msg->SubType) {
case ICMMap: // Server has sent us new map info
pathlen = sprintf(ScenSelectFullPath, "%s/", FreeCraftLibPath);
memcpy(ScenSelectFullPath+pathlen, msg->u.MapPath, 256);
ScenSelectFullPath[pathlen+255] = 0;
pathlen = sprintf(MenuMapFullPath, "%s/", FreeCraftLibPath);
memcpy(MenuMapFullPath+pathlen, msg->u.MapPath, 256);
MenuMapFullPath[pathlen+255] = 0;
if (NetClientSelectScenario()) {
NetLocalState = ccs_badmap;
break;
}
if (ntohl(msg->MapUID) != ScenSelectMapInfo->MapUID) {
if (ntohl(msg->MapUID) != MenuMapInfo->MapUID) {
NetLocalState = ccs_badmap;
fprintf(stderr,
"FreeCraft maps do not match (0x%08x) <-> (0x%08x)\n",
(unsigned int)ScenSelectMapInfo->MapUID,
(unsigned int)MenuMapInfo->MapUID,
(unsigned int)ntohl(msg->MapUID));
break;
}
@ -1291,8 +1291,8 @@ local void ServerParseWaiting(const int h)
message.Type = MessageInitReply;
message.SubType = ICMMap; // Send Map info to the client
pathlen = strlen(FreeCraftLibPath) + 1;
memcpy(message.u.MapPath, ScenSelectFullPath+pathlen, 256);
message.MapUID = htonl(ScenSelectMapInfo->MapUID);
memcpy(message.u.MapPath, MenuMapFullPath+pathlen, 256);
message.MapUID = htonl(MenuMapInfo->MapUID);
n = NetworkSendICMessage(NetLastHost, NetLastPort, &message);
DebugLevel0Fn("Sending InitReply Message Map: (%d) to %d.%d.%d.%d:%d\n" _C_
n _C_ NIPQUAD(ntohl(NetLastHost)) _C_ ntohs(NetLastPort));
@ -1326,7 +1326,7 @@ local void ServerParseWaiting(const int h)
message.Type = MessageInitReply;
message.SubType = ICMState; // Send new state info to the client
message.u.State = ServerSetupState;
message.MapUID = htonl(ScenSelectMapInfo->MapUID);
message.MapUID = htonl(MenuMapInfo->MapUID);
n = NetworkSendICMessage(NetLastHost, NetLastPort, &message);
DebugLevel0Fn("Sending InitReply Message State: (%d) to %d.%d.%d.%d:%d\n" _C_
n _C_ NIPQUAD(ntohl(NetLastHost)) _C_ ntohs(NetLastPort));
@ -1367,7 +1367,7 @@ local void ServerParseMap(const int h)
message.Type = MessageInitReply;
message.SubType = ICMState; // Send State info to the client
message.u.State = ServerSetupState;
message.MapUID = htonl(ScenSelectMapInfo->MapUID);
message.MapUID = htonl(MenuMapInfo->MapUID);
n = NetworkSendICMessage(NetLastHost, NetLastPort, &message);
DebugLevel0Fn("Sending InitReply Message State: (%d) to %d.%d.%d.%d:%d\n" _C_
n _C_ NIPQUAD(ntohl(NetLastHost)) _C_ ntohs(NetLastPort));
@ -1425,7 +1425,7 @@ local void ServerParseState(const int h, const InitMessage* msg)
message.Type = MessageInitReply;
message.SubType = ICMState; // Send new state info to the client
message.u.State = ServerSetupState;
message.MapUID = htonl(ScenSelectMapInfo->MapUID);
message.MapUID = htonl(MenuMapInfo->MapUID);
n = NetworkSendICMessage(NetLastHost, NetLastPort, &message);
DebugLevel0Fn("Sending InitReply Message State: (%d) to %d.%d.%d.%d:%d\n" _C_
n _C_ NIPQUAD(ntohl(NetLastHost)) _C_ ntohs(NetLastPort));

91
src/ui/menus.cpp
View file

@ -375,9 +375,6 @@ global _MenuFuncHash MenuFuncHash;
*(void **)hash_add(MenuFuncHash,(y)) = (void *)(x); \
}
/// Name, Version, Copyright FIXME: move to headerfile
extern char NameLine[];
/// A game was loaded
local int GameLoaded;
/// Game started
@ -395,9 +392,9 @@ global ServerSetup ServerSetupState, LocalSetupState;
local char ScenSelectPath[1024]; /// Scenario selector path
local char ScenSelectDisplayPath[1024]; /// Displayed selector path
local char ScenSelectFileName[128]; /// Scenario selector name
global char ScenSelectFullPath[1024]; /// Scenario selector path+name
global MapInfo *ScenSelectMapInfo; /// Selected pud info
global MapInfo *MenuMapInfo; /// Selected map info
global char MenuMapFullPath[1024]; /// Selected map path+name
local char *SaveDir; /// Save game directory
local char TempPathBuf[PATH_MAX]; /// Temporary buffer for paths
@ -2388,8 +2385,8 @@ local void GetInfoFromSelectPath(void)
{
int i;
FreeMapInfo(ScenSelectMapInfo);
ScenSelectMapInfo = NULL;
FreeMapInfo(MenuMapInfo);
MenuMapInfo = NULL;
if (ScenSelectPath[0]) {
i = strlen(ScenSelectPath);
@ -2399,14 +2396,14 @@ local void GetInfoFromSelectPath(void)
}
strcat(ScenSelectPath, ScenSelectFileName); // Final map name with path
if (strcasestr(ScenSelectFileName, ".pud")) {
ScenSelectMapInfo = GetPudInfo(ScenSelectPath);
strcpy(ScenSelectFullPath, ScenSelectPath);
MenuMapInfo = GetPudInfo(ScenSelectPath);
strcpy(MenuMapFullPath, ScenSelectPath);
} else if (strcasestr(ScenSelectFileName, ".scm")) {
ScenSelectMapInfo = GetScmInfo(ScenSelectPath);
strcpy(ScenSelectFullPath, ScenSelectPath);
MenuMapInfo = GetScmInfo(ScenSelectPath);
strcpy(MenuMapFullPath, ScenSelectPath);
} else if (strcasestr(ScenSelectFileName, ".chk")) {
ScenSelectMapInfo = GetChkInfo(ScenSelectPath);
strcpy(ScenSelectFullPath, ScenSelectPath);
MenuMapInfo = GetChkInfo(ScenSelectPath);
strcpy(MenuMapFullPath, ScenSelectPath);
} else {
// FIXME: GetCmInfo();
}
@ -2429,12 +2426,12 @@ local void ScenSelectMenu(void)
menu = FindMenu("menu-custom-game");
// FIXME: This check is only needed until GetCmInfo works
if (!ScenSelectMapInfo) {
if (!MenuMapInfo) {
menu->items[12].d.pulldown.noptions = PlayerMax-1;
menu->items[12].d.pulldown.curopt = 0;
} else {
for (n = j = 0; j < PlayerMax; ++j) {
t = ScenSelectMapInfo->PlayerType[j];
t = MenuMapInfo->PlayerType[j];
if (t == PlayerPerson || t == PlayerComputer) {
n++;
}
@ -3761,8 +3758,8 @@ local void GameCancel(void)
VideoLockScreen();
MenusSetBackground();
VideoUnlockScreen();
FreeMapInfo(ScenSelectMapInfo);
ScenSelectMapInfo = NULL;
FreeMapInfo(MenuMapInfo);
MenuMapInfo = NULL;
EndMenu();
}
@ -3774,8 +3771,8 @@ local void CustomGameStart(void)
int i;
char *p;
FreeMapInfo(ScenSelectMapInfo);
ScenSelectMapInfo = NULL;
FreeMapInfo(MenuMapInfo);
MenuMapInfo = NULL;
if (ScenSelectPath[0]) {
strcat(ScenSelectPath, "/");
@ -3843,12 +3840,12 @@ local void GameSetupInit(Menuitem *mi __attribute__ ((unused)))
menu = FindMenu("menu-custom-game");
// FIXME: This check is only needed until GetCmInfo works
if (!ScenSelectMapInfo) {
if (!MenuMapInfo) {
menu->items[12].d.pulldown.noptions = PlayerMax-1;
menu->items[12].d.pulldown.curopt = 0;
} else {
for (n = j = 0; j < PlayerMax; ++j) {
t = ScenSelectMapInfo->PlayerType[j];
t = MenuMapInfo->PlayerType[j];
if (t == PlayerPerson || t == PlayerComputer) {
n++;
}
@ -3876,11 +3873,11 @@ local void GameDrawFunc(Menuitem *mi __attribute__((unused)))
l = VideoTextLength(GameFont, "Scenario:");
VideoDrawText(TheUI.Offset640X + 16, TheUI.Offset480Y + 360, GameFont, "Scenario:");
VideoDrawText(TheUI.Offset640X + 16, TheUI.Offset480Y + 360+24 , GameFont, ScenSelectFileName);
if (ScenSelectMapInfo) {
if (ScenSelectMapInfo->Description) {
VideoDrawText(TheUI.Offset640X + 16 + l + 8, TheUI.Offset480Y + 360, GameFont, ScenSelectMapInfo->Description);
if (MenuMapInfo) {
if (MenuMapInfo->Description) {
VideoDrawText(TheUI.Offset640X + 16 + l + 8, TheUI.Offset480Y + 360, GameFont, MenuMapInfo->Description);
}
sprintf(buffer, " (%d x %d)", ScenSelectMapInfo->MapWidth, ScenSelectMapInfo->MapHeight);
sprintf(buffer, " (%d x %d)", MenuMapInfo->MapWidth, MenuMapInfo->MapHeight);
VideoDrawText(TheUI.Offset640X + 16+l+8+VideoTextLength(GameFont, ScenSelectFileName), TheUI.Offset480Y + 360+24, GameFont, buffer);
}
#if 0
@ -4082,7 +4079,7 @@ local void NetworkGamePrepareGameSettings(void)
int num[PlayerMax];
int comp[PlayerMax];
DebugCheck(!ScenSelectMapInfo);
DebugCheck(!MenuMapInfo);
DebugLevel0Fn("NetPlayers = %d\n" _C_ NetPlayers);
@ -4102,11 +4099,11 @@ local void NetworkGamePrepareGameSettings(void)
// Make a list of the available player slots.
for (c = h = i = 0; i < PlayerMax; i++) {
if (ScenSelectMapInfo->PlayerType[i] == PlayerPerson) {
if (MenuMapInfo->PlayerType[i] == PlayerPerson) {
DebugLevel3Fn("Player slot %i is available for a person\n" _C_ i);
num[h++] = i;
}
if (ScenSelectMapInfo->PlayerType[i] == PlayerComputer) {
if (MenuMapInfo->PlayerType[i] == PlayerComputer) {
comp[c++] = i; // available computer player slots
}
}
@ -4177,10 +4174,10 @@ local void MultiGamePlayerSelectorsUpdate(int initial)
// Calculate available slots from pudinfo
for (c = h = i = 0; i < PlayerMax; i++) {
if (ScenSelectMapInfo->PlayerType[i] == PlayerPerson) {
if (MenuMapInfo->PlayerType[i] == PlayerPerson) {
h++; // available interactive player slots
}
if (ScenSelectMapInfo->PlayerType[i] == PlayerComputer) {
if (MenuMapInfo->PlayerType[i] == PlayerComputer) {
c++; // available computer player slots
}
}
@ -4310,10 +4307,10 @@ local void MultiClientUpdate(int initial)
// Calculate available slots from pudinfo
for (c = h = i = 0; i < PlayerMax; i++) {
if (ScenSelectMapInfo->PlayerType[i] == PlayerPerson) {
if (MenuMapInfo->PlayerType[i] == PlayerPerson) {
h++; // available interactive player slots
}
if (ScenSelectMapInfo->PlayerType[i] == PlayerComputer) {
if (MenuMapInfo->PlayerType[i] == PlayerComputer) {
c++; // available computer player slots
}
}
@ -4406,7 +4403,7 @@ local void MultiGameSetupInit(Menuitem *mi)
memset(&ServerSetupState, 0, sizeof(ServerSetup));
// Calculate available slots from pudinfo
for (h = i = 0; i < PlayerMax; i++) {
if (ScenSelectMapInfo->PlayerType[i] == PlayerPerson) {
if (MenuMapInfo->PlayerType[i] == PlayerPerson) {
h++; // available interactive player slots
}
}
@ -4629,30 +4626,30 @@ global int NetClientSelectScenario(void)
{
char *cp;
FreeMapInfo(ScenSelectMapInfo);
ScenSelectMapInfo = NULL;
FreeMapInfo(MenuMapInfo);
MenuMapInfo = NULL;
cp = strrchr(ScenSelectFullPath, '/');
cp = strrchr(MenuMapFullPath, '/');
if (cp) {
strcpy(ScenSelectFileName, cp + 1);
*cp = 0;
strcpy(ScenSelectPath, ScenSelectFullPath);
strcpy(ScenSelectPath, MenuMapFullPath);
*cp = '/';
} else {
strcpy(ScenSelectFileName, ScenSelectFullPath);
strcpy(ScenSelectFileName, MenuMapFullPath);
ScenSelectPath[0] = 0;
}
if (strcasestr(ScenSelectFileName, ".pud")) {
ScenSelectMapInfo = GetPudInfo(ScenSelectFullPath);
MenuMapInfo = GetPudInfo(MenuMapFullPath);
} else if (strcasestr(ScenSelectFileName, ".scm")) {
ScenSelectMapInfo = GetScmInfo(ScenSelectFullPath);
MenuMapInfo = GetScmInfo(MenuMapFullPath);
} else if (strcasestr(ScenSelectFileName, ".chk")) {
ScenSelectMapInfo = GetChkInfo(ScenSelectFullPath);
MenuMapInfo = GetChkInfo(MenuMapFullPath);
} else {
// FIXME: GetCmInfo();
}
return ScenSelectMapInfo == NULL;
return MenuMapInfo == NULL;
}
/**
@ -6741,16 +6738,16 @@ global void InitMenuFunctions(void)
//
// Autodetect the swamp tileset
//
strcpy(ScenSelectFullPath, FreeCraftLibPath);
if (ScenSelectFullPath[0]) {
strcat(ScenSelectFullPath, "/graphics/tilesets/");
strcpy(MenuMapFullPath, FreeCraftLibPath);
if (MenuMapFullPath[0]) {
strcat(MenuMapFullPath, "/graphics/tilesets/");
}
strcat(ScenSelectFullPath, "swamp");
strcat(MenuMapFullPath, "swamp");
menu = FindMenu("menu-custom-game");
//
// FIXME: Johns: this didn't work if the files are in ZIP archive.
//
if (access(ScenSelectFullPath, F_OK) != 0) {
if (access(MenuMapFullPath, F_OK) != 0) {
// ARI FIXME: Hack to disable Expansion Gfx..
// also shows how to add new tilesets....
// - FIXME2: