Menu
▾
▴
[Paintown-list] SF.net SVN: paintown:[4265] trunk/src
|
From: <ka...@us...> - 2010-06-17 02:17:22
|
Revision: 4265
http://paintown.svn.sourceforge.net/paintown/?rev=4265&view=rev
Author: kazzmir
Date: 2010-06-17 02:17:15 +0000 (Thu, 17 Jun 2010)
Log Message:
-----------
remove old ReturnException
Modified Paths:
--------------
trunk/src/game/console.cpp
trunk/src/game/console.h
trunk/src/game.cpp
trunk/src/main-menu.cpp
trunk/src/menu/menu.h
trunk/src/menu/menu_global.cpp
trunk/src/menu/menu_global.h
trunk/src/menu/menu_option.h
trunk/src/menu/tab_menu.cpp
trunk/src/menu/tab_menu.h
trunk/src/mugen/game.cpp
trunk/src/mugen/menu.cpp
trunk/src/mugen/menu.h
trunk/src/mugen/option-options.cpp
Removed Paths:
-------------
trunk/src/exceptions/return_exception.h
Deleted: trunk/src/exceptions/return_exception.h
===================================================================
--- trunk/src/exceptions/return_exception.h 2010-06-17 01:32:51 UTC (rev 4264)
+++ trunk/src/exceptions/return_exception.h 2010-06-17 02:17:15 UTC (rev 4265)
@@ -1,22 +0,0 @@
-#ifndef _paintown_return_exception_h
-#define _paintown_return_exception_h
-
-#include "exception.h"
-
-#if 0
-#include <exception>
-
-/* This exception is thrown when the user wants to return to the previous menu or
- * whatever from some menu or the game by through some abnormal means (like
- * pressing ESC). If there is an "exit" button in the menu then usually you shouldn't
- * throw this exception, just return as normal.
- */
-class ReturnException: public std::exception {
-public:
- ReturnException():exception(){}
-
- virtual ~ReturnException() throw(){}
-};
-#endif
-
-#endif
Modified: trunk/src/game/console.cpp
===================================================================
--- trunk/src/game/console.cpp 2010-06-17 01:32:51 UTC (rev 4264)
+++ trunk/src/game/console.cpp 2010-06-17 02:17:15 UTC (rev 4265)
@@ -3,6 +3,7 @@
#include "util/font.h"
#include "util/funcs.h"
#include "util/file-system.h"
+#include "exceptions/exception.h"
#include "input/input-manager.h"
#include "input/input-map.h"
#include "globals.h"
Modified: trunk/src/game/console.h
===================================================================
--- trunk/src/game/console.h 2010-06-17 01:32:51 UTC (rev 4264)
+++ trunk/src/game/console.h 2010-06-17 02:17:15 UTC (rev 4265)
@@ -7,7 +7,6 @@
#include <map>
#include "input/input-map.h"
#include "util/file-system.h"
-#include "exceptions/return_exception.h"
class Bitmap;
Modified: trunk/src/game.cpp
===================================================================
--- trunk/src/game.cpp 2010-06-17 01:32:51 UTC (rev 4264)
+++ trunk/src/game.cpp 2010-06-17 02:17:15 UTC (rev 4265)
@@ -19,6 +19,7 @@
#include "globals.h"
#include "script/script.h"
#include "exceptions/shutdown_exception.h"
+#include "exceptions/exception.h"
#include "util/file-system.h"
#include "util/events.h"
#include "menu/menu_global.h"
Modified: trunk/src/main-menu.cpp
===================================================================
--- trunk/src/main-menu.cpp 2010-06-17 01:32:51 UTC (rev 4264)
+++ trunk/src/main-menu.cpp 2010-06-17 02:17:15 UTC (rev 4265)
@@ -13,6 +13,7 @@
#include "input/input-manager.h"
#include "game/mod.h"
#include "exceptions/shutdown_exception.h"
+#include "exceptions/exception.h"
#include "util/timedifference.h"
#include "util/funcs.h"
#include "util/ftalleg.h"
Modified: trunk/src/menu/menu.h
===================================================================
--- trunk/src/menu/menu.h 2010-06-17 01:32:51 UTC (rev 4264)
+++ trunk/src/menu/menu.h 2010-06-17 02:17:15 UTC (rev 4265)
@@ -8,7 +8,6 @@
#include "util/load_exception.h"
#include "util/file-system.h"
#include "input/input-map.h"
-#include "exceptions/return_exception.h"
#include "gui/box.h"
#include "gui/context-box.h"
#include "gui/popup-box.h"
Modified: trunk/src/menu/menu_global.cpp
===================================================================
--- trunk/src/menu/menu_global.cpp 2010-06-17 01:32:51 UTC (rev 4264)
+++ trunk/src/menu/menu_global.cpp 2010-06-17 02:17:15 UTC (rev 4265)
@@ -47,7 +47,7 @@
else return std::string();
}
-void MenuGlobals::playSelectSound() throw (LoadException){
+void MenuGlobals::playSelectSound(){
if (!selectSound.empty()){
try{
Sound * select = Resource::getSound(selectSound.top());
Modified: trunk/src/menu/menu_global.h
===================================================================
--- trunk/src/menu/menu_global.h 2010-06-17 01:32:51 UTC (rev 4264)
+++ trunk/src/menu/menu_global.h 2010-06-17 02:17:15 UTC (rev 4265)
@@ -3,9 +3,7 @@
#include <string>
#include <queue>
-#include "util/load_exception.h"
#include "util/file-system.h"
-#include "exceptions/return_exception.h"
#include "level/utils.h"
class Sound;
@@ -27,7 +25,7 @@
static const std::string currentSelectSound();
/*! play current select sound */
- static void playSelectSound() throw (LoadException);
+ static void playSelectSound();
/*! pop select sound */
static void popSelectSound();
Modified: trunk/src/menu/menu_option.h
===================================================================
--- trunk/src/menu/menu_option.h 2010-06-17 01:32:51 UTC (rev 4264)
+++ trunk/src/menu/menu_option.h 2010-06-17 02:17:15 UTC (rev 4265)
@@ -6,7 +6,6 @@
#include "gui/box.h"
#include "util/load_exception.h"
#include "util/language-string.h"
-#include "exceptions/return_exception.h"
#include "gui/context-box.h"
class Bitmap;
@@ -15,7 +14,7 @@
class MenuAnimation;
class Point;
-class MenuOption : public Gui::ContextItem{
+class MenuOption : public Gui::ContextItem {
public:
// Do logic before run part
virtual void logic()=0;
Modified: trunk/src/menu/tab_menu.cpp
===================================================================
--- trunk/src/menu/tab_menu.cpp 2010-06-17 01:32:51 UTC (rev 4264)
+++ trunk/src/menu/tab_menu.cpp 2010-06-17 02:17:15 UTC (rev 4265)
@@ -8,6 +8,7 @@
#include "util/token.h"
#include "util/tokenreader.h"
#include "util/file-system.h"
+#include "exceptions/exception.h"
#include "resource.h"
#include "globals.h"
#include "init.h"
Modified: trunk/src/menu/tab_menu.h
===================================================================
--- trunk/src/menu/tab_menu.h 2010-06-17 01:32:51 UTC (rev 4264)
+++ trunk/src/menu/tab_menu.h 2010-06-17 02:17:15 UTC (rev 4265)
@@ -6,7 +6,6 @@
#include "gui/box.h"
#include "gui/popup-box.h"
#include "gui/context-box.h"
-#include "exceptions/return_exception.h"
#include "input/input-map.h"
class Font;
Modified: trunk/src/mugen/game.cpp
===================================================================
--- trunk/src/mugen/game.cpp 2010-06-17 01:32:51 UTC (rev 4264)
+++ trunk/src/mugen/game.cpp 2010-06-17 02:17:15 UTC (rev 4265)
@@ -15,6 +15,7 @@
#include "util/funcs.h"
#include "factory/font_render.h"
#include "exceptions/shutdown_exception.h"
+#include "exceptions/exception.h"
#include "loading.h"
#include "character.h"
Modified: trunk/src/mugen/menu.cpp
===================================================================
--- trunk/src/mugen/menu.cpp 2010-06-17 01:32:51 UTC (rev 4264)
+++ trunk/src/mugen/menu.cpp 2010-06-17 02:17:15 UTC (rev 4265)
@@ -15,6 +15,7 @@
#include "stage.h"
+#include "exceptions/exception.h"
#include "init.h"
#include "resource.h"
#include "util/funcs.h"
Modified: trunk/src/mugen/menu.h
===================================================================
--- trunk/src/mugen/menu.h 2010-06-17 01:32:51 UTC (rev 4264)
+++ trunk/src/mugen/menu.h 2010-06-17 02:17:15 UTC (rev 4265)
@@ -11,7 +11,6 @@
#include "menu/menu_option.h"
#include "util.h"
-#include "exceptions/return_exception.h"
/*
* We already have a setup for menus, might as well as utilize it to accomodate mugen
Modified: trunk/src/mugen/option-options.cpp
===================================================================
--- trunk/src/mugen/option-options.cpp 2010-06-17 01:32:51 UTC (rev 4264)
+++ trunk/src/mugen/option-options.cpp 2010-06-17 02:17:15 UTC (rev 4265)
@@ -18,7 +18,7 @@
#include "util/file-system.h"
#include "util/timedifference.h"
#include "input/input-manager.h"
-#include "exceptions/return_exception.h"
+#include "exceptions/exception.h"
#include "gui/box.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|