| @@ -11,6 +11,8 @@ | |||||
| #if !defined __DH_BITFIELD_H__ | #if !defined __DH_BITFIELD_H__ | ||||
| #define __DH_BITFIELD_H__ | #define __DH_BITFIELD_H__ | ||||
| #include <stdint.h> | |||||
| template class BitField<unsigned int COUNT> | template class BitField<unsigned int COUNT> | ||||
| { | { | ||||
| public: | public: | ||||
| @@ -36,8 +38,7 @@ public: | |||||
| private: | private: | ||||
| /* FIXME: use uint32_t here instead */ | |||||
| unsigned int bits[(COUNT + 31) / 32]; | |||||
| uint32_t bits[(COUNT + 31) / 32]; | |||||
| }; | }; | ||||
| #endif // __DH_BITFIELD_H__ | #endif // __DH_BITFIELD_H__ | ||||
| @@ -100,7 +100,6 @@ gboolean GlMapView::IdleTick() | |||||
| return FALSE; | return FALSE; | ||||
| } | } | ||||
| // FIXME: do not do anything if the previous tick was too recent? | |||||
| ticking = TRUE; | ticking = TRUE; | ||||
| if (mapviewer) | if (mapviewer) | ||||
| @@ -154,6 +153,8 @@ gboolean GlMapView::Draw(GdkEventExpose *e) | |||||
| gtk_gl_area_swapbuffers(GTK_GL_AREA(glarea)); | gtk_gl_area_swapbuffers(GTK_GL_AREA(glarea)); | ||||
| while (g_main_context_iteration(NULL, FALSE)) | while (g_main_context_iteration(NULL, FALSE)) | ||||
| ; | ; | ||||
| // FIXME: do some GTK stuff in here | |||||
| Ticker::ClampFps(1000.0f / FPS); | Ticker::ClampFps(1000.0f / FPS); | ||||
| } | } | ||||
| @@ -67,7 +67,7 @@ private: | |||||
| if (update) | if (update) | ||||
| cycles0 = cycles; | cycles0 = cycles; | ||||
| towait = deltams - ret; | towait = deltams - ret; | ||||
| if (towait > 5e-4f) // FIXME: use native Win32 stuff | |||||
| if (towait > 5e-4f) | |||||
| Sleep((int)(towait + 0.5f)); | Sleep((int)(towait + 0.5f)); | ||||
| #else | #else | ||||
| /* The crappy SDL fallback */ | /* The crappy SDL fallback */ | ||||