Small fixes. Missed a gl link.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@893 dfc29bdd-3216-0410-991c-e03cc46cb475

examples/Demo/CDemo.cpp

@@ -4,15 +4,19 @@
 #include "CDemo.h"
 
 CDemo::CDemo(bool f, bool m, bool s, bool a, bool v, video::E_DRIVER_TYPE d)
-: fullscreen(f), driverType(d), currentScene(-2),
- model1(0), model2(0), music(m),
- shadows(s), quakeLevelMesh(0), quakeLevelNode(0), timeForThisScene(0),
- skyboxNode(0), mapSelector(0), metaSelector(0), campFire(0), device(0),
- additive(a), vsync(v)
-{
+: fullscreen(f), music(m), shadows(s), additive(a), vsync(v),
+ driverType(d), device(0),
 #ifdef USE_IRRKLANG
-	irrKlang = 0;
+	irrKlang(0), ballSound(0), impactSound(0),
+#endif
+#ifdef USE_SDL_MIXER
+	stream(0), ballSound(0), impactSound(0),
 #endif
+ currentScene(-2), backColor(0), statusText(0), inOutFader(0),
+ quakeLevelMesh(0), quakeLevelNode(0), skyboxNode(0), model1(0), model2(0),
+ campFire(0), metaSelector(0), mapSelector(0), sceneStartTime(0),
+ timeForThisScene(0)
+{
 }
 
 

examples/Demo/CMainMenu.cpp

@@ -44,7 +44,7 @@ public:
 		}
 
 		irr::video::SColorHSL color;
-		irr::video::SColor rgb;
+		irr::video::SColor rgb(0);
 		color.Hue = ( ( timeMs + Phase ) % Frequency  ) * ( 2.f * irr::core::PI / Frequency );
 		color.Saturation = 1.f;
 		color.Luminance = 0.5f;
@@ -68,7 +68,7 @@ private:
 
 
 CMainMenu::CMainMenu()
-: startButton(0), device(0), start(false), fullscreen(true), selected(2),
+: startButton(0), device(0), selected(2), start(false), fullscreen(true),
 	music(true), shadows(false), additive(false), transparent(true), vsync(true)
 {
 }

examples/Demo/Makefile

@@ -3,7 +3,7 @@ Target = Demo
 Sources = CDemo.cpp CMainMenu.cpp main.cpp
 
 CPPFLAGS = -I../../include -I/usr/X11R6/include
-CXXFLAGS = -O3 -ffast-math
+CXXFLAGS = -Wall -O3 -ffast-math
 
 ifeq ($(HOSTTYPE), x86_64)
 LIBSELECT=64
@@ -13,7 +13,7 @@ all: all_linux
 
 # target specific settings
 all_linux: SYSTEM=Linux
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lXxf86vm -lXext -lX11
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11
 
 all_win32 clean_win32: SYSTEM=Win32-gcc
 all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm