[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer/src Lib/Exception.cpp Lib/Exception.h...
|
From: |
Matthias Braun |
|
Subject: |
[netPanzer-CVS] netpanzer/src Lib/Exception.cpp Lib/Exception.h... |
|
Date: |
Sat, 06 Sep 2003 18:31:21 -0400 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/09/06 18:31:21
Modified files:
src/Lib : Exception.cpp Exception.hpp FileUtil.cpp
FileUtil.hpp FindFirst.cpp FindFirst.hpp
Log.cpp Log.hpp SplitPath.cpp SplitPath.hpp
Util.hpp
src/NetPanzer/Classes: WorldInputCmdProcessor.cpp
src/NetPanzer/Core: netPanzerWinMain.cpp netPanzerWinProc.cpp
src/NetPanzer/Core/unix: main.cpp
src/NetPanzer/Interfaces: GameManager.cpp MouseInterface.cpp
src/NetPanzer/Views/MainMenu: MenuTemplateView.cpp
src/NetPanzer/Views/MainMenu/Options: ControlsView.cpp
src/UILib : Sound.cpp Sound.hpp
src/UILib/SDL : SDLSound.cpp SDLSound.hpp
Removed files:
src/Lib : Stdafx.hpp
src/Lib/Interfaces: JoystickInterface.cpp JoystickInterface.hpp
src/NetPanzer/Core: netPanzerGlobals.h
Log message:
-some code cleanups:
*removed JoystickInterface completely
*removed netPanzerGlobals.*
*removed netPanzerMain.*
Patches:
Index: netpanzer/src/Lib/Exception.cpp
diff -u netpanzer/src/Lib/Exception.cpp:1.1 netpanzer/src/Lib/Exception.cpp:1.2
--- netpanzer/src/Lib/Exception.cpp:1.1 Fri Sep 5 19:01:48 2003
+++ netpanzer/src/Lib/Exception.cpp Sat Sep 6 18:31:20 2003
@@ -1,3 +1,20 @@
+/*
+Copyright (C) 2003 Matthias Braun <address@hidden>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#include <config.h>
#include <stdio.h>
Index: netpanzer/src/Lib/Exception.hpp
diff -u netpanzer/src/Lib/Exception.hpp:1.1 netpanzer/src/Lib/Exception.hpp:1.2
--- netpanzer/src/Lib/Exception.hpp:1.1 Fri Sep 5 19:01:48 2003
+++ netpanzer/src/Lib/Exception.hpp Sat Sep 6 18:31:20 2003
@@ -1,3 +1,20 @@
+/*
+Copyright (C) 2003 Matthias Braun <address@hidden>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#ifndef __SOCKET_EXCEPTION_H__
#define __SOCKET_EXCEPTION_H__
Index: netpanzer/src/Lib/FileUtil.cpp
diff -u netpanzer/src/Lib/FileUtil.cpp:1.1 netpanzer/src/Lib/FileUtil.cpp:1.2
--- netpanzer/src/Lib/FileUtil.cpp:1.1 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/FileUtil.cpp Sat Sep 6 18:31:20 2003
@@ -1,3 +1,20 @@
+/*
+Copyright (C) 2003 Matthias Braun <address@hidden>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#include <config.h>
#ifdef UNIX
Index: netpanzer/src/Lib/FileUtil.hpp
diff -u netpanzer/src/Lib/FileUtil.hpp:1.1 netpanzer/src/Lib/FileUtil.hpp:1.2
--- netpanzer/src/Lib/FileUtil.hpp:1.1 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/FileUtil.hpp Sat Sep 6 18:31:20 2003
@@ -1,3 +1,20 @@
+/*
+Copyright (C) 2003 Matthias Braun <address@hidden>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#ifndef __FILEUTIL_H__
#define __FILEUTIL_H__
Index: netpanzer/src/Lib/FindFirst.cpp
diff -u netpanzer/src/Lib/FindFirst.cpp:1.4 netpanzer/src/Lib/FindFirst.cpp:1.5
--- netpanzer/src/Lib/FindFirst.cpp:1.4 Sat Sep 6 16:53:24 2003
+++ netpanzer/src/Lib/FindFirst.cpp Sat Sep 6 18:31:20 2003
@@ -1,3 +1,20 @@
+/*
+Copyright (C) 2003 Matthias Braun <address@hidden>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#include <config.h>
#include <glob.h>
Index: netpanzer/src/Lib/FindFirst.hpp
diff -u netpanzer/src/Lib/FindFirst.hpp:1.1 netpanzer/src/Lib/FindFirst.hpp:1.2
--- netpanzer/src/Lib/FindFirst.hpp:1.1 Sat Sep 6 09:12:39 2003
+++ netpanzer/src/Lib/FindFirst.hpp Sat Sep 6 18:31:20 2003
@@ -1,3 +1,20 @@
+/*
+Copyright (C) 2003 Matthias Braun <address@hidden>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#ifndef __FINDFIRST_HPP__
#define __FINDFIRST_HPP__
Index: netpanzer/src/Lib/Log.cpp
diff -u netpanzer/src/Lib/Log.cpp:1.1 netpanzer/src/Lib/Log.cpp:1.2
--- netpanzer/src/Lib/Log.cpp:1.1 Sat Sep 6 11:18:18 2003
+++ netpanzer/src/Lib/Log.cpp Sat Sep 6 18:31:20 2003
@@ -1,3 +1,20 @@
+/*
+Copyright (C) 2003 Matthias Braun <address@hidden>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#include <config.h>
#include <stdarg.h>
Index: netpanzer/src/Lib/Log.hpp
diff -u netpanzer/src/Lib/Log.hpp:1.1 netpanzer/src/Lib/Log.hpp:1.2
--- netpanzer/src/Lib/Log.hpp:1.1 Sat Sep 6 11:18:18 2003
+++ netpanzer/src/Lib/Log.hpp Sat Sep 6 18:31:20 2003
@@ -1,3 +1,20 @@
+/*
+Copyright (C) 2003 Matthias Braun <address@hidden>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#ifndef __LIB_LOG_HPP__
#define __LIB_LOG_HPP__
Index: netpanzer/src/Lib/SplitPath.cpp
diff -u netpanzer/src/Lib/SplitPath.cpp:1.2 netpanzer/src/Lib/SplitPath.cpp:1.3
--- netpanzer/src/Lib/SplitPath.cpp:1.2 Sat Sep 6 16:53:24 2003
+++ netpanzer/src/Lib/SplitPath.cpp Sat Sep 6 18:31:20 2003
@@ -1,3 +1,20 @@
+/*
+Copyright (C) 2003 Matthias Braun <address@hidden>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#include <config.h>
#include <stdio.h>
Index: netpanzer/src/Lib/SplitPath.hpp
diff -u netpanzer/src/Lib/SplitPath.hpp:1.1 netpanzer/src/Lib/SplitPath.hpp:1.2
--- netpanzer/src/Lib/SplitPath.hpp:1.1 Sat Sep 6 16:49:45 2003
+++ netpanzer/src/Lib/SplitPath.hpp Sat Sep 6 18:31:20 2003
@@ -1,3 +1,20 @@
+/*
+Copyright (C) 2003 Matthias Braun <address@hidden>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#ifndef __SPLITPATH_HPP__
#define __SPLITPATH_HPP__
Index: netpanzer/src/Lib/Util.hpp
diff -u netpanzer/src/Lib/Util.hpp:1.1 netpanzer/src/Lib/Util.hpp:1.2
--- netpanzer/src/Lib/Util.hpp:1.1 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/Util.hpp Sat Sep 6 18:31:20 2003
@@ -1,11 +1,25 @@
+/*
+Copyright (C) 2003 Matthias Braun <address@hidden>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#ifndef __LIB_UTIL_HPP__
#define __LIB_UTIL_HPP__
-// Utility functions which aren't defined in unix.
+// Utility functions (these have been used but not defined in the code?)
-/***** Additions by Matze... Are these already defined on msvc? */
-
-#ifndef MSVC
template<typename T>
static inline void SWAP(T& v1, T& v2)
{
@@ -33,6 +47,5 @@
{
return v1 < v2 ? v2 : v1;
}
-#endif
#endif
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.7
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.8
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.7 Sat Sep
6 07:04:14 2003
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp Sat Sep 6
18:31:20 2003
@@ -48,12 +48,8 @@
#include "codewiz.hpp"
#include "ConsoleInterface.hpp"
-#include "netPanzerGlobals.h"
-#include "JoystickInterface.hpp"
-
WorldInputCmdProcessor COMMAND_PROCESSOR;
-
enum { _cursor_regular,
_cursor_move,
_cursor_blocked,
@@ -126,41 +122,37 @@
}
void WorldInputCmdProcessor::updateScrollStatus(const PointXYi &mouse_pos )
- {
- PointXYi screen_size;
- double time_slice;
- long scroll_increment;
- float scroll_rate;
-
- screen_size = FRAME_BUFFER.getPix();
- time_slice = TimerInterface::getTimeSlice();
- scroll_rate = GameConfig::getScrollRate();
+{
+ PointXYi screen_size;
+ double time_slice;
+ long scroll_increment;
+ float scroll_rate;
+
+ screen_size = FRAME_BUFFER.getPix();
+ time_slice = TimerInterface::getTimeSlice();
+ scroll_rate = GameConfig::getScrollRate();
- scroll_increment = (long) ( scroll_rate * time_slice );
+ scroll_increment = (long) ( scroll_rate * time_slice );
- if( mouse_pos.x >= (screen_size.x - 1) ||
- gInputOffset.x > JoystickInterface::errorThreshold)
- {
+ if(mouse_pos.x >= (screen_size.x - 1))
+ {
WorldViewInterface::scroll_right(scroll_increment);
- }
+ }
- if( mouse_pos.x < 1 ||
- gInputOffset.x < -JoystickInterface::errorThreshold)
- {
+ if( mouse_pos.x < 1)
+ {
WorldViewInterface::scroll_left(scroll_increment);
- }
+ }
- if( mouse_pos.y >= (screen_size.y - 1) ||
- gInputOffset.y < -JoystickInterface::errorThreshold)
- {
+ if( mouse_pos.y >= (screen_size.y - 1))
+ {
WorldViewInterface::scroll_down(scroll_increment);
- }
+ }
- if( mouse_pos.y < 1 ||
- gInputOffset.y > JoystickInterface::errorThreshold)
- {
+ if( mouse_pos.y < 1)
+ {
WorldViewInterface::scroll_up(scroll_increment);
- }
+ }
}
@@ -1006,18 +998,6 @@
evaluateKeyboardEvents();
evaluateMouseEvents();
- if (JoystickInterface::button_down(0))
- {
- PointXYi world_pos;
- PointXYi mouse_pos;
-
- MouseInterface::getMousePosition( (long *) &mouse_pos.x, (long *)
&mouse_pos.y );
-
- WorldViewInterface::clientXYtoWorldXY(world_win, mouse_pos, &world_pos);
-
- sendManualFireCommand(world_pos);
- }
-
working_list.validateList();
}
Index: netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp
diff -u netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp:1.7
netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp:1.8
--- netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp:1.7 Sat Sep 6
18:13:41 2003
+++ netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp Sat Sep 6 18:31:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-// XXX need new unix code here
#ifdef WIN32
#include <config.h>
#include <stdlib.h>
Index: netpanzer/src/NetPanzer/Core/netPanzerWinProc.cpp
diff -u netpanzer/src/NetPanzer/Core/netPanzerWinProc.cpp:1.5
netpanzer/src/NetPanzer/Core/netPanzerWinProc.cpp:1.6
--- netpanzer/src/NetPanzer/Core/netPanzerWinProc.cpp:1.5 Sat Sep 6
07:35:35 2003
+++ netpanzer/src/NetPanzer/Core/netPanzerWinProc.cpp Sat Sep 6 18:31:20 2003
@@ -15,14 +15,11 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-// XXX need new unix code here
-#ifndef UNIX
+#ifdef WIN32
#include <config.h>
#include <windows.h>
#include "netPanzerWinProc.h"
-#include "netPanzerGlobals.h"
-#include "netPanzerMain.h"
#include "gapp.hpp"
#include "Win32Mouse.hpp"
#include "MouseInterface.hpp"
@@ -304,7 +301,7 @@
PANZER_THREAD_ACTIVE = false;
//while( PANZER_THREAD_FINISHED == false );
//TerminateThread( (HANDLE) PANZER_THREAD_HANDLE, 0 );
- netPanzerShutdown();
+ GameManager::shutdown();
PostQuitMessage(0);
}
break;
Index: netpanzer/src/NetPanzer/Core/unix/main.cpp
diff -u netpanzer/src/NetPanzer/Core/unix/main.cpp:1.4
netpanzer/src/NetPanzer/Core/unix/main.cpp:1.5
--- netpanzer/src/NetPanzer/Core/unix/main.cpp:1.4 Sat Sep 6 13:15:34 2003
+++ netpanzer/src/NetPanzer/Core/unix/main.cpp Sat Sep 6 18:31:20 2003
@@ -1,3 +1,20 @@
+/*
+Copyright (C) 2003 Matthias Braun <address@hidden>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#include <config.h>
#include <stdio.h>
#include <stdlib.h>
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.19
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.20
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.19 Sat Sep 6
17:05:27 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp Sat Sep 6 18:31:20 2003
@@ -28,7 +28,6 @@
// ** netPanzer Core Includes
#include "gapp.hpp"
-#include "netPanzerGlobals.h"
// ** Direct X Includes
#ifdef WIN32
@@ -1886,7 +1885,6 @@
if (once)
{
once = false;
- gMainLoopBegin = true;
Desktop::setVisibility("MainView", true);
}
@@ -1930,15 +1928,6 @@
{
KeyboardInterface::sampleKeyboard();
- // XXX Joystick code disabled
-#if 0
- if (JoystickInterface::exists())
- {
- JoystickInterface::poll();
- gInputOffset = JoystickInterface::getOffset();
- }
-#endif
-
processSystemKeys();
Desktop::manage(mouse.getScreenPos().x, mouse.getScreenPos().y,
mouse.getButtonMask() );
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.5
netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.5 Sat Sep 6
11:39:25 2003
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp Sat Sep 6
18:31:20 2003
@@ -25,7 +25,6 @@
#endif
#include "MouseInterface.hpp"
-#include "netPanzerGlobals.h"
#include "DDHardSurface.hpp"
#include "cMouse.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.6
netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.7
--- netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.6 Sat Sep
6 11:39:25 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp Sat Sep 6
18:31:20 2003
@@ -31,7 +31,6 @@
#include "Particle2D.hpp"
#include "ParticleSystem2D.hpp"
#include "PackedSurface.hpp"
-#include "netPanzerGlobals.h"
#include "UtilInterface.hpp"
#include "GameManager.hpp"
#include "GameViewGlobals.hpp"
@@ -266,7 +265,6 @@
void MenuTemplateView::doDraw(const Surface &viewArea, const Surface
&clientArea)
{
//setWorldRect();
- assert(gMainLoopBegin);
if (Desktop::getVisible("GameView"))
{
@@ -355,11 +353,9 @@
//---------------------------------------------------------------------------
void MenuTemplateView::doActivate()
{
- if (gMainLoopBegin)
- {
- // Make the activating view active, redo this please!
- sprintf(currentView, searchName);
- Desktop::setActiveView(searchName);
+ // Make the activating view active, redo this please!
+ sprintf(currentView, searchName);
+ Desktop::setActiveView(searchName);
// Load apprpriate images for this view.
//if (globeSurface.getFrameCount() <= 0)
@@ -382,13 +378,11 @@
//
globeSurface.save("pics/backgrounds/menus/globe/pak/globe.pak");
// }
//}
- loadBackgroundSurface();
- loadTitleSurface();
- loadNetPanzerLogo();
- }
+ loadBackgroundSurface();
+ loadTitleSurface();
+ loadNetPanzerLogo();
SpecialButtonView::doActivate();
-
} // end doActivate
// loadBackgroundSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.5
netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.6
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.5 Sat Sep
6 11:39:26 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp Sat Sep
6 18:31:20 2003
@@ -21,7 +21,6 @@
#include "ControlsView.hpp"
#include "Desktop.hpp"
#include "DDHardSurface.hpp"
-#include "JoystickInterface.hpp"
#include "GameConfig.hpp"
#include "GameViewGlobals.hpp"
Index: netpanzer/src/UILib/SDL/SDLSound.cpp
diff -u netpanzer/src/UILib/SDL/SDLSound.cpp:1.2
netpanzer/src/UILib/SDL/SDLSound.cpp:1.3
--- netpanzer/src/UILib/SDL/SDLSound.cpp:1.2 Sat Sep 6 17:05:27 2003
+++ netpanzer/src/UILib/SDL/SDLSound.cpp Sat Sep 6 18:31:20 2003
@@ -1,3 +1,20 @@
+/*
+Copyright (C) 2003 Matthias Braun <address@hidden>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#include <config.h>
#include "SDLSound.hpp"
Index: netpanzer/src/UILib/SDL/SDLSound.hpp
diff -u netpanzer/src/UILib/SDL/SDLSound.hpp:1.1
netpanzer/src/UILib/SDL/SDLSound.hpp:1.2
--- netpanzer/src/UILib/SDL/SDLSound.hpp:1.1 Sat Sep 6 13:16:44 2003
+++ netpanzer/src/UILib/SDL/SDLSound.hpp Sat Sep 6 18:31:20 2003
@@ -1,3 +1,20 @@
+/*
+Copyright (C) 2003 Matthias Braun <address@hidden>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#ifndef __UILIB_SDLSOUND_HPP__
#define __UILIB_SDLSOUND_HPP__
Index: netpanzer/src/UILib/Sound.cpp
diff -u netpanzer/src/UILib/Sound.cpp:1.1 netpanzer/src/UILib/Sound.cpp:1.2
--- netpanzer/src/UILib/Sound.cpp:1.1 Sat Sep 6 07:05:40 2003
+++ netpanzer/src/UILib/Sound.cpp Sat Sep 6 18:31:20 2003
@@ -1,3 +1,20 @@
+/*
+Copyright (C) 2003 Matthias Braun <address@hidden>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#include <config.h>
#include "Sound.hpp"
Index: netpanzer/src/UILib/Sound.hpp
diff -u netpanzer/src/UILib/Sound.hpp:1.1 netpanzer/src/UILib/Sound.hpp:1.2
--- netpanzer/src/UILib/Sound.hpp:1.1 Sat Sep 6 07:05:40 2003
+++ netpanzer/src/UILib/Sound.hpp Sat Sep 6 18:31:20 2003
@@ -1,3 +1,20 @@
+/*
+Copyright (C) 2003 Matthias Braun <address@hidden>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#ifndef __UILIB_SOUND_HPP__
#define __UILIB_SOUND_HPP__
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [netPanzer-CVS] netpanzer/src Lib/Exception.cpp Lib/Exception.h...,
Matthias Braun <=