Changeset 1105
- Timestamp:
- Dec 5, 2011, 9:24:04 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/Makefile.am
r1097 r1105 12 12 worldentity.cpp worldentity.h gradient.cpp gradient.h half.cpp half.h \ 13 13 platform.cpp platform.h sprite.cpp sprite.h trig.cpp trig.h \ 14 real.cpp real.h \14 real.cpp real.h emcee.cpp emcee.h \ 15 15 \ 16 16 lol/unit.h \ -
trunk/src/application/application.cpp
r1082 r1105 60 60 Application::Application(char const *name, ivec2 resolution, float framerate) 61 61 { 62 Emcee::Setup(); 62 63 data = new ApplicationData(name, resolution, framerate); 63 64 } … … 76 77 { 77 78 delete data; 79 Emcee::Shutdown(); 78 80 } 79 81 -
trunk/src/core.h
r1093 r1105 104 104 105 105 // Managers 106 #include "emcee.h" 106 107 #include "ticker.h" 107 108 #include "forge.h" -
trunk/src/entity.cpp
r735 r1105 69 69 } 70 70 71 void Entity::SetState(uint32_t state) 72 { 73 Emcee::SetState(this, state); 74 } 75 76 void Entity::SetStateWhenMatch(uint32_t state, 77 Entity *other_entity, uint32_t other_state) 78 { 79 Emcee::SetStateWhenMatch(this, state, other_entity, other_state); 80 } 81 71 82 } /* namespace lol */ 72 83 -
trunk/src/entity.h
r748 r1105 78 78 #endif 79 79 80 // Emcee begin 81 private: 82 void SetState(uint32_t newstate); 83 void SetStateWhenMatch(uint32_t newstate, 84 Entity *other_entity, uint32_t other_state); 85 virtual uint32_t OnStateChanged(uint32_t newstate) 86 { 87 return m_state = newstate; 88 } 89 90 uint32_t m_state; 91 // Emcee end 92 80 93 private: 81 94 Entity *gamenext, *drawnext, *autonext; -
trunk/src/thread/threadbase.h
r1101 r1105 18 18 19 19 #if defined __linux__ || defined __native_client__ 20 # include <cstring>21 20 # include <pthread.h> 22 21 #elif defined _WIN32 -
trunk/test/debug/sandbox.cpp
r961 r1105 19 19 #include "core.h" 20 20 21 class Moo 22 { 23 Moo() {} 24 25 virtual int SetState(int state) { return state; } 26 }; 27 21 28 using namespace std; 22 29 using namespace lol;
Note: See TracChangeset
for help on using the changeset viewer.