forked from mirrors/principia
Cleanups and minor refactoring in main.cc/hh
This commit is contained in:
parent
eca1b4807b
commit
f3e13c4a80
2 changed files with 621 additions and 756 deletions
1507
src/main.cc
1507
src/main.cc
File diff suppressed because it is too large
Load diff
24
src/main.hh
24
src/main.hh
|
|
@ -125,8 +125,7 @@ struct register_data {
|
|||
char password[256];
|
||||
};
|
||||
|
||||
class intermediary : public tms::screen
|
||||
{
|
||||
class intermediary : public tms::screen {
|
||||
public:
|
||||
int (*loader)(int);
|
||||
tms::screen *next;
|
||||
|
|
@ -138,8 +137,7 @@ class intermediary : public tms::screen
|
|||
void window_size_changed();
|
||||
};
|
||||
|
||||
extern class principia
|
||||
{
|
||||
extern class principia {
|
||||
public:
|
||||
~principia();
|
||||
intermediary *s_intermediary;
|
||||
|
|
@ -181,26 +179,22 @@ extern class principia
|
|||
float default_diffuse;
|
||||
|
||||
void add_action(int id, void *data);
|
||||
void add_action(int id, uint32_t data=0)
|
||||
{
|
||||
void add_action(int id, uint32_t data=0) {
|
||||
this->add_action(id, UINT_TO_VOID(data));
|
||||
};
|
||||
void add_action(int id, int data=0)
|
||||
{
|
||||
}
|
||||
void add_action(int id, int data=0) {
|
||||
this->add_action(id, INT_TO_VOID(data));
|
||||
};
|
||||
void add_action(int id, const char *data)
|
||||
{
|
||||
}
|
||||
void add_action(int id, const char *data) {
|
||||
this->add_action(id, (void*)data);
|
||||
};
|
||||
}
|
||||
|
||||
tvec3 get_light_normal();
|
||||
|
||||
void update_uiscale(float new_uiscale);
|
||||
} P;
|
||||
|
||||
struct principia_action
|
||||
{
|
||||
struct principia_action {
|
||||
int action_id;
|
||||
void *action_data;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue