projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
567cfcb
)
added function to get the size of a player's inventory for all game engines
author
Holger Schemel
<info@artsoft.org>
Wed, 23 Nov 2016 19:06:50 +0000
(20:06 +0100)
committer
Holger Schemel
<info@artsoft.org>
Wed, 23 Nov 2016 19:07:16 +0000
(20:07 +0100)
src/game.c
patch
|
blob
|
history
src/game.h
patch
|
blob
|
history
diff --git
a/src/game.c
b/src/game.c
index 3d2f055f27c88415dccb499d83d65932ad8a5f1e..6144f0d200d17a27026eb31425dd08e4e0ddf933 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-2050,6
+2050,16
@@
static int compareGamePanelOrderInfo(const void *object1, const void *object2)
return compare_result;
}
return compare_result;
}
+int getPlayerInventorySize(int player_nr)
+{
+ if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+ return level.native_em_level->ply[player_nr]->dynamite;
+ else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
+ return level.native_sp_level->game_sp->red_disk_count;
+ else
+ return stored_player[player_nr].inventory_size;
+}
+
void InitGameControlValues()
{
int i;
void InitGameControlValues()
{
int i;
@@
-2187,15
+2197,8
@@
void UpdateGameControlValues()
get_key_element_from_nr(k);
}
get_key_element_from_nr(k);
}
- if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
- game_panel_controls[GAME_PANEL_INVENTORY_COUNT].value +=
- level.native_em_level->ply[i]->dynamite;
- else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
- game_panel_controls[GAME_PANEL_INVENTORY_COUNT].value +=
- level.native_sp_level->game_sp->red_disk_count;
- else
- game_panel_controls[GAME_PANEL_INVENTORY_COUNT].value +=
- stored_player[i].inventory_size;
+ game_panel_controls[GAME_PANEL_INVENTORY_COUNT].value +=
+ getPlayerInventorySize(i);
if (stored_player[i].num_white_keys > 0)
game_panel_controls[GAME_PANEL_KEY_WHITE].value =
if (stored_player[i].num_white_keys > 0)
game_panel_controls[GAME_PANEL_KEY_WHITE].value =
@@
-2222,15
+2225,8
@@
void UpdateGameControlValues()
get_key_element_from_nr(k);
}
get_key_element_from_nr(k);
}
- if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
- game_panel_controls[GAME_PANEL_INVENTORY_COUNT].value +=
- level.native_em_level->ply[player_nr]->dynamite;
- else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
- game_panel_controls[GAME_PANEL_INVENTORY_COUNT].value +=
- level.native_sp_level->game_sp->red_disk_count;
- else
- game_panel_controls[GAME_PANEL_INVENTORY_COUNT].value +=
- stored_player[player_nr].inventory_size;
+ game_panel_controls[GAME_PANEL_INVENTORY_COUNT].value +=
+ getPlayerInventorySize(player_nr);
if (stored_player[player_nr].num_white_keys > 0)
game_panel_controls[GAME_PANEL_KEY_WHITE].value = EL_DC_KEY_WHITE;
if (stored_player[player_nr].num_white_keys > 0)
game_panel_controls[GAME_PANEL_KEY_WHITE].value = EL_DC_KEY_WHITE;
diff --git
a/src/game.h
b/src/game.h
index 22e59af69a8c24839ace1ba34453accf1d3fbaf0..7bf665e821304f10af32db57337eb5561681bb1f 100644
(file)
--- a/
src/game.h
+++ b/
src/game.h
@@
-344,6
+344,8
@@
void DEBUG_SetMaximumDynamite();
void GetPlayerConfig(void);
int GetElementFromGroupElement(int);
void GetPlayerConfig(void);
int GetElementFromGroupElement(int);
+int getPlayerInventorySize(int);
+
void DrawGameValue_Time(int);
void DrawGameDoorValues(void);
void DrawGameValue_Time(int);
void DrawGameDoorValues(void);