projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed preprocessor definition for network mode that is always true now
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index 78a371e33896c5b7fd2af2d322f1b28792855935..13634a2c76122ab7b2a37f0482a5c123b1ecb90a 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-1731,7
+1731,7
@@
static void InitPlayerField(int x, int y, int element, boolean init_game)
if (game.use_block_last_field_bug)
player->block_delay_adjustment = (player->block_last_field ? -1 : 1);
if (game.use_block_last_field_bug)
player->block_delay_adjustment = (player->block_last_field ? -1 : 1);
- if (!
options.network
|| player->connected_network)
+ if (!
network.enabled
|| player->connected_network)
{
player->active = TRUE;
{
player->active = TRUE;
@@
-3321,7
+3321,7
@@
void InitGame()
InitGameControlValues();
/* don't play tapes over network */
InitGameControlValues();
/* don't play tapes over network */
- network_playing = (
options.network
&& !tape.playing);
+ network_playing = (
network.enabled
&& !tape.playing);
for (i = 0; i < MAX_PLAYERS; i++)
{
for (i = 0; i < MAX_PLAYERS; i++)
{
@@
-3503,11
+3503,9
@@
void InitGame()
network_player_action_received = FALSE;
network_player_action_received = FALSE;
-#if defined(NETWORK_AVALIABLE)
/* initial null action */
if (network_playing)
SendToServer_MovePlayer(MV_NONE);
/* initial null action */
if (network_playing)
SendToServer_MovePlayer(MV_NONE);
-#endif
ZX = ZY = -1;
ExitX = ExitY = -1;
ZX = ZY = -1;
ExitX = ExitY = -1;
@@
-3699,7
+3697,7
@@
void InitGame()
local_player = &stored_player[i];
}
local_player = &stored_player[i];
}
- if (!
options.network
)
+ if (!
network.enabled
)
local_player->connected = TRUE;
if (tape.playing)
local_player->connected = TRUE;
if (tape.playing)
@@
-3707,7
+3705,7
@@
void InitGame()
for (i = 0; i < MAX_PLAYERS; i++)
stored_player[i].connected = tape.player_participates[i];
}
for (i = 0; i < MAX_PLAYERS; i++)
stored_player[i].connected = tape.player_participates[i];
}
- else if (
options.network
)
+ else if (
network.enabled
)
{
/* add team mode players connected over the network (needed for correct
assignment of player figures from level to locally playing players) */
{
/* add team mode players connected over the network (needed for correct
assignment of player figures from level to locally playing players) */
@@
-3962,7
+3960,7
@@
void InitGame()
}
#endif
}
}
#endif
}
- else if (!
options.network
&& !game.team_mode) /* && !tape.playing */
+ else if (!
network.enabled
&& !game.team_mode) /* && !tape.playing */
{
/* when in single player mode, eliminate all but the first active player */
{
/* when in single player mode, eliminate all but the first active player */
@@
-11290,14
+11288,12
@@
void StartGameActions(boolean init_network_game, boolean record_tape,
if (record_tape)
TapeStartRecording(new_random_seed);
if (record_tape)
TapeStartRecording(new_random_seed);
-#if defined(NETWORK_AVALIABLE)
if (init_network_game)
{
SendToServer_StartPlaying();
return;
}
if (init_network_game)
{
SendToServer_StartPlaying();
return;
}
-#endif
InitGame();
}
InitGame();
}
@@
-11333,7
+11329,7
@@
void GameActionsExt()
}
if (game.restart_level)
}
if (game.restart_level)
- StartGameActions(
options.network
, setup.autorecord, level.random_seed);
+ StartGameActions(
network.enabled
, setup.autorecord, level.random_seed);
/* !!! SAME CODE AS IN "CheckLevelTime()" -- FIX THIS !!! */
if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
/* !!! SAME CODE AS IN "CheckLevelTime()" -- FIX THIS !!! */
if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
@@
-11420,10
+11416,8
@@
void GameActionsExt()
{
/* try to get network player actions in time */
{
/* try to get network player actions in time */
-#if defined(NETWORK_AVALIABLE)
/* last chance to get network player actions without main loop delay */
HandleNetworking();
/* last chance to get network player actions without main loop delay */
HandleNetworking();
-#endif
/* game was quit by network peer */
if (game_status != GAME_MODE_PLAYING)
/* game was quit by network peer */
if (game_status != GAME_MODE_PLAYING)
@@
-11469,14
+11463,12
@@
void GameActionsExt()
stored_player[i].effective_action = stored_player[i].action;
}
stored_player[i].effective_action = stored_player[i].action;
}
-#if defined(NETWORK_AVALIABLE)
if (network_playing)
SendToServer_MovePlayer(summarized_player_action);
if (network_playing)
SendToServer_MovePlayer(summarized_player_action);
-#endif
// summarize all actions at local players mapped input device position
// (this allows using different input devices in single player mode)
// summarize all actions at local players mapped input device position
// (this allows using different input devices in single player mode)
- if (!
options.network
&& !game.team_mode)
+ if (!
network.enabled
&& !game.team_mode)
stored_player[map_player_action[local_player->index_nr]].effective_action =
summarized_player_action;
stored_player[map_player_action[local_player->index_nr]].effective_action =
summarized_player_action;
@@
-12386,7
+12378,7
@@
boolean MovePlayerOneStep(struct PlayerInfo *player,
}
}
}
}
- if (!
options.network
&& game.centered_player_nr == -1 &&
+ if (!
network.enabled
&& game.centered_player_nr == -1 &&
!AllPlayersInSight(player, new_jx, new_jy))
return MP_NO_ACTION;
!AllPlayersInSight(player, new_jx, new_jy))
return MP_NO_ACTION;
@@
-12573,7
+12565,7
@@
boolean MovePlayer(struct PlayerInfo *player, int dx, int dy)
if (scroll_x != old_scroll_x || scroll_y != old_scroll_y)
{
if (scroll_x != old_scroll_x || scroll_y != old_scroll_y)
{
- if (!
options.network
&& game.centered_player_nr == -1 &&
+ if (!
network.enabled
&& game.centered_player_nr == -1 &&
!AllPlayersInVisibleScreen())
{
scroll_x = old_scroll_x;
!AllPlayersInVisibleScreen())
{
scroll_x = old_scroll_x;
@@
-14967,11
+14959,9
@@
void RequestQuitGameExt(boolean skip_request, boolean quick_quit, char *message)
if (!skip_request)
CloseDoor(DOOR_CLOSE_1);
if (!skip_request)
CloseDoor(DOOR_CLOSE_1);
-#if defined(NETWORK_AVALIABLE)
- if (options.network)
+ if (network.enabled)
SendToServer_StopPlaying(NETWORK_STOP_BY_PLAYER);
else
SendToServer_StopPlaying(NETWORK_STOP_BY_PLAYER);
else
-#endif
{
if (quick_quit)
FadeSkipNextFadeIn();
{
if (quick_quit)
FadeSkipNextFadeIn();
@@
-15008,7
+14998,7
@@
void RequestRestartGame(char *message)
if (Request(message, REQ_ASK | REQ_STAY_CLOSED))
{
if (Request(message, REQ_ASK | REQ_STAY_CLOSED))
{
- StartGameActions(
options.network
, setup.autorecord, level.random_seed);
+ StartGameActions(
network.enabled
, setup.autorecord, level.random_seed);
}
else
{
}
else
{
@@
-15470,7
+15460,8
@@
void CreateGameButtons()
for (i = 0; i < NUM_GAME_BUTTONS; i++)
{
for (i = 0; i < NUM_GAME_BUTTONS; i++)
{
- struct GraphicInfo *gfx = &graphic_info[gamebutton_info[i].graphic];
+ int graphic = gamebutton_info[i].graphic;
+ struct GraphicInfo *gfx = &graphic_info[graphic];
struct XY *pos = gamebutton_info[i].pos;
struct GadgetInfo *gi;
int button_type;
struct XY *pos = gamebutton_info[i].pos;
struct GadgetInfo *gi;
int button_type;
@@
-15524,6
+15515,7
@@
void CreateGameButtons()
}
gi = CreateGadget(GDI_CUSTOM_ID, id,
}
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_IMAGE_ID, graphic,
GDI_INFO_TEXT, gamebutton_info[i].infotext,
GDI_X, base_x + GDI_ACTIVE_POS(pos->x),
GDI_Y, base_y + GDI_ACTIVE_POS(pos->y),
GDI_INFO_TEXT, gamebutton_info[i].infotext,
GDI_X, base_x + GDI_ACTIVE_POS(pos->x),
GDI_Y, base_y + GDI_ACTIVE_POS(pos->y),
@@
-15775,14
+15767,12
@@
static void HandleGameButtonsExt(int id, int button)
case GAME_CTRL_ID_PAUSE:
case GAME_CTRL_ID_PAUSE2:
case GAME_CTRL_ID_PANEL_PAUSE:
case GAME_CTRL_ID_PAUSE:
case GAME_CTRL_ID_PAUSE2:
case GAME_CTRL_ID_PANEL_PAUSE:
- if (
options.network
&& game_status == GAME_MODE_PLAYING)
+ if (
network.enabled
&& game_status == GAME_MODE_PLAYING)
{
{
-#if defined(NETWORK_AVALIABLE)
if (tape.pausing)
SendToServer_ContinuePlaying();
else
SendToServer_PausePlaying();
if (tape.pausing)
SendToServer_ContinuePlaying();
else
SendToServer_PausePlaying();
-#endif
}
else
TapeTogglePause(TAPE_TOGGLE_MANUAL);
}
else
TapeTogglePause(TAPE_TOGGLE_MANUAL);
@@
-15795,15
+15785,13
@@
static void HandleGameButtonsExt(int id, int button)
case GAME_CTRL_ID_PANEL_PLAY:
if (game_status == GAME_MODE_MAIN)
{
case GAME_CTRL_ID_PANEL_PLAY:
if (game_status == GAME_MODE_MAIN)
{
- StartGameActions(
options.network
, setup.autorecord, level.random_seed);
+ StartGameActions(
network.enabled
, setup.autorecord, level.random_seed);
}
else if (tape.pausing)
{
}
else if (tape.pausing)
{
-#if defined(NETWORK_AVALIABLE)
- if (options.network)
+ if (network.enabled)
SendToServer_ContinuePlaying();
else
SendToServer_ContinuePlaying();
else
-#endif
TapeTogglePause(TAPE_TOGGLE_MANUAL | TAPE_TOGGLE_PLAY_PAUSE);
}
break;
TapeTogglePause(TAPE_TOGGLE_MANUAL | TAPE_TOGGLE_PLAY_PAUSE);
}
break;