mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix merge fails. Renamed a few functions

This commit is contained in:
Duncan Frost 2014-10-10 11:13:54 +01:00
parent 252d7f7987
commit 2a3989019b
6 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
projects/openrct2.vcxproj
View File

@ -125,6 +125,7 @@
<ClCompile Include="..\src\windows\scenery.c" />
<ClCompile Include="..\src\windows\shortcut_keys.c" />
<ClCompile Include="..\src\windows\shortcut_key_change.c" />
<ClCompile Include="..\src\windows\staff_fire_prompt.c" />
<ClCompile Include="..\src\windows\staff_list.c" />
<ClCompile Include="..\src\windows\staff.c" />
<ClCompile Include="..\src\windows\title_exit.c" />

3
projects/openrct2.vcxproj.filters
View File

@ -422,6 +422,9 @@
<ClCompile Include="..\src\world\banner.c">
<Filter>Source\World</Filter>
</ClCompile>
<ClCompile Include="..\src\windows\staff_fire_prompt.c">
<Filter>Source\Windows</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\management\award.h">

4
src/game.h
View File

@ -53,8 +53,8 @@ enum GAME_COMMAND {
GAME_COMMAND_28,
GAME_COMMAND_HIRE_NEW_STAFF_MEMBER, // 29
GAME_COMMAND_30,
GAME_COMMAND_31,
GAME_COMMAND_SET_STAFF_ORDER,
GAME_COMMAND_FIRE_STAFF_MEMBER, // 31
GAME_COMMAND_SET_STAFF_ORDER, // 32
GAME_COMMAND_33,
GAME_COMMAND_SET_PARK_OPEN, // 34
GAME_COMMAND_35,

2
src/interface/window.h
View File

@ -480,7 +480,7 @@ void window_shortcut_keys_open();
void window_shortcut_change_open(int selected_key);
void window_guest_open(rct_peep* peep);
void window_staff_open(rct_peep* peep);
void window_staff_fire_open(rct_peep* peep);
void window_staff_fire_prompt_open(rct_peep* peep);
void window_park_awards_open();
void window_park_entrance_open();
void window_park_guests_open();

2
src/windows/staff.c
View File

@ -406,7 +406,7 @@ void window_staff_overview_mouseup()
RCT2_CALLPROC_X(0x0069A42F, 0, 0, 0, 0, (int)peep, 0, 0);
break;
case WIDX_FIRE: // 0xE
window_staff_fire_open(peep);
window_staff_fire_prompt_open(peep);
break;
case WIDX_RENAME: // 0xC
// 6BE4BC

23
src/window_staff_fire.c → src/windows/staff_fire_prompt.c
View File

@ -18,14 +18,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
#include "addresses.h"
#include "peep.h"
#include "string_ids.h"
#include "sprite.h"
#include "sprites.h"
#include "widget.h"
#include "window.h"
#include "staff.h"
#include "../addresses.h"
#include "../game.h"
#include "../interface/widget.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"
#include "../peep/peep.h"
#include "../peep/staff.h"
#include "../sprites.h"
#include "../world/sprite.h"
#define WW 200
#define WH 100
@ -84,7 +85,7 @@ static void* window_staff_fire_events[] = {
window_staff_fire_emptysub
};
/** Based off of rct2: 0x6C0A77 */
void window_staff_fire_open(rct_peep* peep){
void window_staff_fire_prompt_open(rct_peep* peep){
// Check if the confirm window already exists.
if (window_bring_to_front_by_id(WC_FIRE_PROMPT, peep->sprite_index)) {
return;
@ -122,7 +123,7 @@ static void window_staff_fire_mouseup(){
switch (widgetIndex){
case WIDX_YES:
game_do_command(peep->x, 1, peep->y, w->number, GAME_COMMAND_31, 0, 0);
game_do_command(peep->x, 1, peep->y, w->number, GAME_COMMAND_FIRE_STAFF_MEMBER, 0, 0);
break;
case WIDX_CANCEL:
case WIDX_CLOSE:
@ -150,5 +151,5 @@ static void window_staff_fire_paint(){
int x = w->x + WW / 2;
int y = w->y + (WH / 2) - 3;
gfx_draw_string_centred_wrapped(dpi, (void*)0x13CE952, x, y, 196, STR_FIRE_STAFF_ID, 0);
gfx_draw_string_centred_wrapped(dpi, (void*)0x13CE952, x, y, WW - 4, STR_FIRE_STAFF_ID, 0);
}