ich777/cdogs-sdl
1
0
Fork 0
mirror of https://github.com/cxong/cdogs-sdl.git synced 2025-07-23 07:23:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix shadow

Browse Source
This commit is contained in:
Cong
2024-11-23 12:04:39 +11:00
parent b26a1465e0
commit b61b47dcbe
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cdogs/map_wolf.c
View File

@@ -3543,11 +3543,11 @@ static bool TryLoadCampaign(CampaignList *list, const char *path)
}
void MapWolfN3DCheckAndLoadCustomQuiz(
const Campaign *c, const CArray *playerDatas)
const char *title, const CArray *playerDatas)
{
// Special case for N3D: Epic of Gilgamesh quiz easter egg
// This code is pretty cursed
if (strcmp(c->Setting.Title, "Super 2D Noah's Ark") != 0)
if (strcmp(title, "Super 2D Noah's Ark") != 0)
{
return;
}

2
src/cdogs/map_wolf.h
View File

@@ -42,4 +42,4 @@ int MapWolfLoad(
void MapWolfLoadCampaignsFromSystem(CampaignList *list);
void MapWolfN3DCheckAndLoadCustomQuiz(
const Campaign *c, const CArray *playerDatas);
const char *title, const CArray *playerDatas);

19
src/prep.c
View File

@@ -364,7 +364,8 @@ static void PlayerSelectionOnExit(GameLoopData *data)
{
gCampaign.MissionIndex = 0;
}
MapWolfN3DCheckAndLoadCustomQuiz(&gCampaign, &gPlayerDatas);
MapWolfN3DCheckAndLoadCustomQuiz(
gCampaign.Setting.Title, &gPlayerDatas);
}
else
{
@@ -393,13 +394,13 @@ static GameLoopResult PlayerSelectionUpdate(GameLoopData *data, LoopRunner *l)
LoopRunnerPop(l);
return UPDATE_RESULT_OK;
}
int idx = 0;
if (pData->endCounter == 0)
{
// Menu input
const int localHumanPlayers = GetNumPlayers(PLAYER_ANY, true, true);
const bool useMenuCmd = (localHumanPlayers <= 1);
const int localHumanPlayers = GetNumPlayers(PLAYER_ANY, true, true);
const bool useMenuCmd = (localHumanPlayers <= 1);
for (int i = 0; i < (int)gPlayerDatas.size; i++, idx++)
{
const PlayerData *p = CArrayGet(&gPlayerDatas, i);
@@ -414,13 +415,13 @@ static GameLoopResult PlayerSelectionUpdate(GameLoopData *data, LoopRunner *l)
if (ms->current->customPostUpdateFunc)
{
ms->current->customPostUpdateFunc(
ms->current, ms->current->customPostUpdateData);
ms->current, ms->current->customPostUpdateData);
}
MenuUpdateMouse(ms);
if (useMenuCmd)
{
cmds[idx] |=
GetMenuCmd(&gEventHandlers, ms->current->mouseHover);
GetMenuCmd(&gEventHandlers, ms->current->mouseHover);
}
if (!MenuIsExit(ms) && cmds[idx])
{
@@ -467,11 +468,13 @@ static GameLoopResult PlayerSelectionUpdate(GameLoopData *data, LoopRunner *l)
idx--;
continue;
}
if (p->inputDevice == INPUT_DEVICE_UNSET || p->inputDevice == INPUT_DEVICE_AI)
if (p->inputDevice == INPUT_DEVICE_UNSET ||
p->inputDevice == INPUT_DEVICE_AI)
{
hasAIPlayers = true;
PlayerTrySetInputDevice(p, INPUT_DEVICE_AI, 0);
pData->menus[idx].ms.current = MenuGetSubmenuByName(pData->menus[idx].ms.root, "Done");
pData->menus[idx].ms.current =
MenuGetSubmenuByName(pData->menus[idx].ms.root, "Done");
}
}
if (hasAIPlayers && pData->endCounter < 70)