diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-12-18 15:14:07 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-12-18 15:14:07 (GMT) |
| commit | 61e86ca72d83dbd8494303245b28530fbc488f78 (patch) | |
| tree | 75841218a685ceed4665ea4283e600b863fc1a70 /src/main.c | |
| parent | 33271ce3e29a0cea246e32e823388db7a8f39abc (diff) | |
| parent | 58b9996958c9dbe2800872659bf4c745c1450e3e (diff) | |
| download | powder-61e86ca72d83dbd8494303245b28530fbc488f78.zip powder-61e86ca72d83dbd8494303245b28530fbc488f78.tar.gz | |
Merge with new lua functionality
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1589,9 +1589,6 @@ int main(int argc, char *argv[]) fmt.callback = mixaudio; fmt.userdata = NULL; -#ifdef LUACONSOLE - luacon_open(); -#endif #ifdef MT numCores = core_count(); #endif @@ -1602,6 +1599,10 @@ int main(int argc, char *argv[]) init_can_move(); clear_sim(); +#ifdef LUACONSOLE + luacon_open(); +#endif + colour_mode = COLOUR_DEFAULT; init_display_modes(); |