mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 01:35:06 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/upstream/master'

Browse Source 
* refs/remotes/upstream/master: (22 commits)
  fix bug with game_do_command
  add game_do_command
  add more info. to scenario_load_and_play
  set default screenshot format to PNG
  reorganise addresses
  fix peep structure
  Identified monthly ride income location.
  Label energy, thirst, hunger with offsets
  allow BMP to still be saved with PNG as default
  label nausea with offset
  Found nausea peep variable
  finish scenario start and add park size calculate
  Changed screenshot format from BMP to PNG (using LodePNG)
  add game flag for development only below tree height
  rename current day to current month ticks
  fix case and add author to source code header
  Fix comments
  Add rct_car sprite and tidy up news locator
  Change peep news item enum names
  Fix finding peep on ride news items
  ...

Conflicts:
	src/peep.h
This commit is contained in:
ZedThree
2014-05-02 14:01:04 +02:00
parent ae637f6291 07c4c61b2e
commit db6374dfda
24 changed files with 8335 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/peep.h
View File

@@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@@ -30,6 +30,13 @@ enum PEEP_TYPE {
PEEP_TYPE_STAFF
};
enum STAFF_TYPE {
STAFF_TYPE_HANDYMAN,
STAFF_TYPE_MECHANIC,
STAFF_TYPE_SECURITY,
STAFF_TYPE_ENTERTAINER
};
enum {
PEEP_FLAGS_TRACKING = 8
};
@@ -68,18 +75,25 @@ typedef struct {
uint8 pad_2C;
uint8 sprite_type; // 0x2D
uint8 type; // 0x2E
uint8 var_2F;
uint8 staff_type; // 0x2F
uint8 var_30;
uint8 var_31;
uint8 pad_32[0x08];
uint8 pad_32[0x06];
uint8 energy; // 0x38
uint8 var_39;
uint8 happiness; // 0x3A
uint8 pad_03B[0x2D];
uint8 var_03B;
uint8 nausea; // 0x3C
uint8 var_03D;
uint8 hunger; // 0x3E
uint8 thirst; // 0x3F
uint8 pad_040[0x28];
uint8 current_ride; // 0x68
uint8 pad_6a; // 0x6A Part of current_ride?
uint8 pad_6A; // 0x6A Part of current_ride?
uint8 current_train; // 0x6B
uint8 current_car; // 0x6C
uint8 current_seat; // 0x6d
uint8 pad_6C[0x2e];
uint8 current_seat; // 0x6D
uint8 pad_6E[0x2E];
uint32 id; // 0x9C
uint8 pad_A0[0x10];
rct_peep_thought thoughts[PEEP_MAX_THOUGHTS]; // 0xB0