kyush/principia
1
0
Fork 0
forked from mirrors/principia
Code Pull requests Activity Actions

Cleanups and minor refactoring in object_factory.cc/hh

Browse source
This commit is contained in:
ROllerozxa 2026-06-05 16:24:41 +02:00
commit d14bf51465
3 changed files with 411 additions and 454 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main.cc
View file

@ -1681,8 +1681,6 @@ static int initial_loader(int step) {
// initialize worker threads // initialize worker threads
w_init(); w_init();
of::init();
P.s_loading_screen->set_text("Loading materials..."); P.s_loading_screen->set_text("Loading materials...");
break; break;

858
src/object_factory.cc
View file

File diff suppressed because it is too large Load diff

7
src/object_factory.hh
View file

@ -245,7 +245,8 @@ class group;
class of class of
{ {
public: public:
static uint32_t _id; /* global entity id counter */ /// global entity id counter
static uint32_t _id;
static const int num_categories = 10; static const int num_categories = 10;
@ -259,8 +260,6 @@ class of
static item *create_item(uint32_t item_id); static item *create_item(uint32_t item_id);
static entity *create_with_id(p_gid g_id, uint32_t id); static entity *create_with_id(p_gid g_id, uint32_t id);
static void init(void);
static entity* read(lvlbuf *lb, uint8_t version, uint32_t id_modifier=0, b2Vec2 displacement=b2Vec2(0.f,0.f), std::vector<chunk_pos> *affected_chunks=0); static entity* read(lvlbuf *lb, uint8_t version, uint32_t id_modifier=0, b2Vec2 displacement=b2Vec2(0.f,0.f), std::vector<chunk_pos> *affected_chunks=0);
static void write(lvlbuf *lb, uint8_t version, entity *e, uint32_t id_modifier=0, b2Vec2 displacement=b2Vec2(0.f,0.f), bool write_states=false); static void write(lvlbuf *lb, uint8_t version, entity *e, uint32_t id_modifier=0, b2Vec2 displacement=b2Vec2(0.f,0.f), bool write_states=false);
@ -268,5 +267,5 @@ class of
static void write_group(lvlbuf *lb, uint8_t version, group *e, uint32_t id_modifier=0, b2Vec2 displacement=b2Vec2(0.f,0.f), bool write_states=false); static void write_group(lvlbuf *lb, uint8_t version, group *e, uint32_t id_modifier=0, b2Vec2 displacement=b2Vec2(0.f,0.f), bool write_states=false);
static int get_gid(int category, int child); static int get_gid(int category, int child);
static uint32_t get_next_id(void); static uint32_t get_next_id();
}; };