[Dunelegacy-commit] SF.net SVN: dunelegacy: [110] branches/dunks

[<shu...@us...>]

Revision: 110
          http://svn.sourceforge.net/dunelegacy/?rev=110&view=rev
Author:   shutdownrunner
Date:     2006-09-02 09:28:26 -0700 (Sat, 02 Sep 2006)

Log Message:
-----------
- Make dunelegacy compilable - No buttons are clickable. No idea why. Yet

Modified Paths:
--------------
    branches/dunks/include/gui2/Widget.h
    branches/dunks/src/Application.cpp
    branches/dunks/src/IntroState.cpp
    branches/dunks/src/MainMenu.cpp
    branches/dunks/src/MenuBase.cpp
    branches/dunks/src/OptionsMenu.cpp
    branches/dunks/src/SConscript
    branches/dunks/src/SingleMenu.cpp
    branches/dunks/src/gui2/Button.cpp

Modified: branches/dunks/include/gui2/Widget.h
===================================================================
--- branches/dunks/include/gui2/Widget.h	2006-08-25 11:01:06 UTC (rev 109)
+++ branches/dunks/include/gui2/Widget.h	2006-09-02 16:28:26 UTC (rev 110)
@@ -15,7 +15,7 @@
         virtual ~Widget();
 		//@}
 
-        virtual void draw(SDL_Surface* dest, SPoint &off) {}
+        virtual void draw(SDL_Surface* dest, SPoint off) {}
 
 		//! @name Event handling functions
 		//@{

Modified: branches/dunks/src/Application.cpp
===================================================================
--- branches/dunks/src/Application.cpp	2006-08-25 11:01:06 UTC (rev 109)
+++ branches/dunks/src/Application.cpp	2006-09-02 16:28:26 UTC (rev 110)
@@ -22,7 +22,7 @@
 #include "Settings.h"
 #include "Font.h"
 #include "TopLevelState.h"
-#include "DataFile.h"
+//#include "DataFile.h"
 
 #include "pakfile/Palette.h"
 #include "pakfile/Shpfile.h"
@@ -409,6 +409,7 @@
             case SDL_MOUSEBUTTONDOWN:
                 m_rootWidget->handleButtonDown( event.button.button,
                                                 SPoint(event.button.x, event.button.y));
+                printf("X:%d, Y:%d\n", event.button.x, event.button.y);                               
                 break;
             case SDL_MOUSEBUTTONUP:
                 m_rootWidget->handleButtonUp(   event.button.button,

Modified: branches/dunks/src/IntroState.cpp
===================================================================
--- branches/dunks/src/IntroState.cpp	2006-08-25 11:01:06 UTC (rev 109)
+++ branches/dunks/src/IntroState.cpp	2006-09-02 16:28:26 UTC (rev 110)
@@ -176,7 +176,7 @@
                      Frame::NO_TRANSITION, 
                      Frame::FADE_OUT,
                      false) );
-    enque( new Frame("INTRO:INTRO2.WSA",  
+    /*enque( new Frame("INTRO:INTRO2.WSA",  
                      Frame::NO_TRANSITION, 
                      Frame::FADE_OUT,
                      false) );
@@ -232,7 +232,7 @@
     enque( new Frame("INTRO:INTRO1.WSA",  
                      Frame::NO_TRANSITION, 
                      Frame::FADE_OUT,
-                     false) );
+                     false) );*/
 
     next();
     m_butIntro = new TranspButton(Settings::Instance()->GetWidth(),

Modified: branches/dunks/src/MainMenu.cpp
===================================================================
--- branches/dunks/src/MainMenu.cpp	2006-08-25 11:01:06 UTC (rev 109)
+++ branches/dunks/src/MainMenu.cpp	2006-09-02 16:28:26 UTC (rev 110)
@@ -1,7 +1,7 @@
 #include "MainMenu.h"
 
 #include "Application.h"
-#include "DataFile.h"
+//#include "DataFile.h"
 #include "Settings.h"
 
 #include "SingleMenu.h"

Modified: branches/dunks/src/MenuBase.cpp
===================================================================
--- branches/dunks/src/MenuBase.cpp	2006-08-25 11:01:06 UTC (rev 109)
+++ branches/dunks/src/MenuBase.cpp	2006-09-02 16:28:26 UTC (rev 110)
@@ -1,7 +1,7 @@
 #include "MainMenu.h"
 
 #include "Application.h"
-#include "DataFile.h"
+//#include "DataFile.h"
 #include "Settings.h"
 
 #include "SingleMenu.h"

Modified: branches/dunks/src/OptionsMenu.cpp
===================================================================
--- branches/dunks/src/OptionsMenu.cpp	2006-08-25 11:01:06 UTC (rev 109)
+++ branches/dunks/src/OptionsMenu.cpp	2006-09-02 16:28:26 UTC (rev 110)
@@ -1,7 +1,7 @@
 #include "OptionsMenu.h"
 
 #include "Application.h"
-#include "DataFile.h"
+//#include "DataFile.h"
 #include "Settings.h"
 
 #include "boost/bind.hpp"

Modified: branches/dunks/src/SConscript
===================================================================
--- branches/dunks/src/SConscript	2006-08-25 11:01:06 UTC (rev 109)
+++ branches/dunks/src/SConscript	2006-09-02 16:28:26 UTC (rev 110)
@@ -17,7 +17,7 @@
                 "Settings.cpp",
                 "Font.cpp",
                 "State.cpp",            
-                "DataFile.cpp",
+#                "DataFile.cpp",
 
                 "TopLevelState.cpp",
                 "MenuBase.cpp", 

Modified: branches/dunks/src/SingleMenu.cpp
===================================================================
--- branches/dunks/src/SingleMenu.cpp	2006-08-25 11:01:06 UTC (rev 109)
+++ branches/dunks/src/SingleMenu.cpp	2006-09-02 16:28:26 UTC (rev 110)
@@ -1,7 +1,7 @@
 #include "SingleMenu.h"
 
 #include "Application.h"
-#include "DataFile.h"
+//#include "DataFile.h"
 #include "Settings.h"
 
 #include "boost/bind.hpp"

Modified: branches/dunks/src/gui2/Button.cpp
===================================================================
--- branches/dunks/src/gui2/Button.cpp	2006-08-25 11:01:06 UTC (rev 109)
+++ branches/dunks/src/gui2/Button.cpp	2006-09-02 16:28:26 UTC (rev 110)
@@ -146,13 +146,13 @@
     drawHLine(m_surfNormal, 0, h-1, w-1, 229, false);
     
     // right lines
-    drawVLine(m_surfNormal, w-1, 0, w-1, 229, false);
-    drawVLine(m_surfNormal, w-2, 1, w-2, 226, false);
+    drawVLine(m_surfNormal, w-1, 0, h-1, 229, false);
+    drawVLine(m_surfNormal, w-2, 1, h-2, 226, false);
     
     // final pixels to make it look really duneish
-  //  putPixel(m_surfNormal, 1, h-2, 115);
-   // putPixel(m_surfNormal, w-2, 1, 115);
-   // putPixel(m_surfNormal, w-2, h-2, 227);
+    putPixel(m_surfNormal, 1, h-2, 115);
+    putPixel(m_surfNormal, w-2, 1, 115);
+    putPixel(m_surfNormal, w-2, h-2, 227);
 
 
     /*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.