projects
/
summerhack
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor gitignore additions
[summerhack]
/
src
/
sumhack.cpp
diff --git
a/src/sumhack.cpp
b/src/sumhack.cpp
index
75c6fa3
..
9491e64
100644
(file)
--- a/
src/sumhack.cpp
+++ b/
src/sumhack.cpp
@@
-88,10
+88,10
@@
bool init() {
}
if(gip->fullscreen) {
}
if(gip->fullscreen) {
- SDL_ShowCursor(0);
+ fxwt::show_cursor(false);
}
}
- fxwt::set_window_title("The Lab Demos :: Summer Hack");
+ fxwt::set_window_title("The Lab Demos :: Summer Hack (rebuild)");
fxwt::set_display_handler(update_gfx);
fxwt::set_idle_handler(update_gfx);
fxwt::set_keyboard_handler(key_handler);
fxwt::set_display_handler(update_gfx);
fxwt::set_idle_handler(update_gfx);
fxwt::set_keyboard_handler(key_handler);
@@
-102,6
+102,7
@@
bool init() {
//dsys::init();
// show loading screen
//dsys::init();
// show loading screen
+ glClear(GL_COLOR_BUFFER_BIT);
dsys::overlay(get_texture("data/img/loading.jpg"), Vector2(0, 0), Vector2(1, 1), 1.0);
flip();
dsys::overlay(get_texture("data/img/loading.jpg"), Vector2(0, 0), Vector2(1, 1), 1.0);
flip();
@@
-145,18
+146,18
@@
bool init() {
timer_reset(&timer);
timer_start(&timer);
timer_reset(&timer);
timer_start(&timer);
-
+
return true;
}
void clean_up() {
unsigned long time = timer_getmsec(&timer);
return true;
}
void clean_up() {
unsigned long time = timer_getmsec(&timer);
-
+
if(music) {
sdlvf_done();
}
if(music) {
sdlvf_done();
}
- SDL_ShowCursor(1);
+ fxwt::show_cursor(true);
for(size_t i=0; i<parts.size(); i++) {
delete parts[i];
for(size_t i=0; i<parts.size(); i++) {
delete parts[i];