ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/Daodan/src/Oni_GameState.h
(Generate patch)

Comparing Daodan/src/Oni_GameState.h (file contents):
Revision 677 by alloc, Sat Mar 2 23:46:33 2013 UTC vs.
Revision 692 by alloc, Thu Mar 7 17:26:13 2013 UTC

# Line 1 | Line 1
1   #ifndef ONI_GAMESTATE_H
2   #define ONI_GAMESTATE_H
3 – #include "Oni_Character.h"
3  
4 + #include "Oni_Character.h"
5  
6   typedef struct {
7          float X;
# Line 419 | Line 419 | typedef enum {
419          chr_bossshield        = 1 << 30,
420          chr_weaponimmune      = 1 << 31,
421   } chr_flags;
422 < /*
423 < enum {
424 < chr_isplayer                    =               0x00000001,     //is player character
425 < chr_randomskin                  =               0x00000002,     //gets random skin from ONCV
426 < chr_notprespawned               =               0x00000004,     //isn't spawned at level creation
427 < chr_noncombatant                =               0x00000008,     //doesn't fight
428 < chr_multispawnable              =               0x00000010,     //can spawn up to 5 without forcing
429 < chr_unknown                             =               0x00000020,     //
430 < chr_unkillable                  =               0x00000040,     //can only be brought to 1 hp
431 < chr_superammo                   =               0x00000080,     //infinite ammo
432 < chr_omniscient                  =               0x00000100,     //touchofdeath
433 < chr_haslsi                              =               0x00000200,     //drops an lsi
434 < chr_boss                                =               0x00000400,     //is a boss character
435 < chr_upgradedifficulty   =               0x00000800,     //upgrade the difficulty if you play on med\hard
436 < chr_noautodrop                  =               0x00001000,     //uses drop fields instead of has fields on death
437 < }; //
438 < */
422 >
423  
424   typedef struct {
425          uint32_t Options;                               //A bitset. Someone had better define these
# Line 1317 | Line 1301 | typedef struct
1301    char field_2837;
1302   } ActiveCharacter;
1303  
1304 < typedef struct
1305 < {
1306 <        char name[64];  // Must be same as ONcMaxLevelName above (for TE)
1307 <        
1308 <        void *env;
1309 <        void *objectsetup;
1310 <        void *markers;
1311 <        void *flags;
1312 <        void *triggers;
1313 <        
1314 <        void *Sky;
1315 <        float   SkyHeight;
1316 <
1317 <
1304 > typedef struct
1305 > {
1306 >        char name[64];  // Must be same as ONcMaxLevelName above (for TE)
1307 >        
1308 >        void *env;
1309 >        void *objectsetup;
1310 >        void *markers;
1311 >        void *flags;
1312 >        void *triggers;
1313 >        
1314 >        void *Sky;
1315 >        float   SkyHeight;
1316 >
1317 >
1318   } OniLevel;
1319  
1320   typedef struct
# Line 1473 | Line 1457 | typedef struct
1457                  int blah2;
1458                          int blah3;
1459   } COtTextArea;
1460 < #endif
1460 >
1461 > #endif
1462 >

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)