[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src game_events.cpp playlevel.cpp playl...
From: |
Yann Dirson |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src game_events.cpp playlevel.cpp playl... |
Date: |
Thu, 10 Mar 2005 15:43:49 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <address@hidden> 05/03/10 20:43:49
Modified files:
src : game_events.cpp playlevel.cpp playlevel.hpp
playturn.cpp playturn.hpp replay.cpp
Log message:
include cleanup: play*
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.cpp.diff?tr1=1.124&tr2=1.125&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playlevel.cpp.diff?tr1=1.181&tr2=1.182&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playlevel.hpp.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.339&tr2=1.340&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.hpp.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/replay.cpp.diff?tr1=1.94&tr2=1.95&r1=text&r2=text
Patches:
Index: wesnoth/src/game_events.cpp
diff -u wesnoth/src/game_events.cpp:1.124 wesnoth/src/game_events.cpp:1.125
--- wesnoth/src/game_events.cpp:1.124 Sun Mar 6 18:14:48 2005
+++ wesnoth/src/game_events.cpp Thu Mar 10 20:43:48 2005
@@ -1,4 +1,4 @@
-/* $Id: game_events.cpp,v 1.124 2005/03/06 18:14:48 ydirson Exp $ */
+/* $Id: game_events.cpp,v 1.125 2005/03/10 20:43:48 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -13,6 +13,7 @@
#include "global.hpp"
+#include "ai.hpp"
#include "game_events.hpp"
#include "image.hpp"
#include "language.hpp"
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.181 wesnoth/src/playlevel.cpp:1.182
--- wesnoth/src/playlevel.cpp:1.181 Wed Mar 9 22:58:18 2005
+++ wesnoth/src/playlevel.cpp Thu Mar 10 20:43:48 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.181 2005/03/09 22:58:18 ydirson Exp $ */
+/* $Id: playlevel.cpp,v 1.182 2005/03/10 20:43:48 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -13,10 +13,13 @@
#include "global.hpp"
+#include "ai_interface.hpp"
#include "cursor.hpp"
+#include "dialogs.hpp"
#include "events.hpp"
#include "filesystem.hpp"
#include "gettext.hpp"
+#include "game_events.hpp"
#include "halo.hpp"
#include "help.hpp"
#include "hotkeys.hpp"
Index: wesnoth/src/playlevel.hpp
diff -u wesnoth/src/playlevel.hpp:1.19 wesnoth/src/playlevel.hpp:1.20
--- wesnoth/src/playlevel.hpp:1.19 Sat Jan 22 10:47:16 2005
+++ wesnoth/src/playlevel.hpp Thu Mar 10 20:43:48 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.hpp,v 1.19 2005/01/22 10:47:16 silene Exp $ */
+/* $Id: playlevel.hpp,v 1.20 2005/03/10 20:43:48 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -13,26 +13,14 @@
#ifndef PLAY_LEVEL_HPP_INCLUDED
#define PLAY_LEVEL_HPP_INCLUDED
-#include "actions.hpp"
-#include "ai_interface.hpp"
-#include "config.hpp"
-#include "dialogs.hpp"
-#include "display.hpp"
+class config;
+class CVideo;
+
#include "game_config.hpp"
#include "gamestatus.hpp"
-#include "key.hpp"
-#include "pathfind.hpp"
-#include "show_dialog.hpp"
-#include "team.hpp"
#include "unit_types.hpp"
-#include "unit.hpp"
-#include "video.hpp"
-#include <cmath>
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <string>
+#include <vector>
enum LEVEL_RESULT { VICTORY, DEFEAT, QUIT, LEVEL_CONTINUE,
LEVEL_CONTINUE_NO_SAVE };
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.339 wesnoth/src/playturn.cpp:1.340
--- wesnoth/src/playturn.cpp:1.339 Wed Mar 9 22:58:18 2005
+++ wesnoth/src/playturn.cpp Thu Mar 10 20:43:48 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.339 2005/03/09 22:58:18 ydirson Exp $ */
+/* $Id: playturn.cpp,v 1.340 2005/03/10 20:43:48 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -14,7 +14,9 @@
#include "global.hpp"
#include "actions.hpp"
+#include "dialogs.hpp"
#include "events.hpp"
+#include "game_events.hpp"
#include "gettext.hpp"
#include "help.hpp"
#include "hotkeys.hpp"
Index: wesnoth/src/playturn.hpp
diff -u wesnoth/src/playturn.hpp:1.62 wesnoth/src/playturn.hpp:1.63
--- wesnoth/src/playturn.hpp:1.62 Wed Mar 9 20:48:42 2005
+++ wesnoth/src/playturn.hpp Thu Mar 10 20:43:48 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.hpp,v 1.62 2005/03/09 20:48:42 ydirson Exp $ */
+/* $Id: playturn.hpp,v 1.63 2005/03/10 20:43:48 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -13,17 +13,13 @@
#ifndef PLAYTURN_HPP_INCLUDED
#define PLAYTURN_HPP_INCLUDED
+class display;
+class gamestatus;
class replay_network_sender;
#include "actions.hpp"
-#include "ai_interface.hpp"
#include "config.hpp"
-#include "dialogs.hpp"
-#include "display.hpp"
#include "events.hpp"
-#include "game_config.hpp"
-#include "game_events.hpp"
-#include "gamestatus.hpp"
#include "hotkeys.hpp"
#include "key.hpp"
#include "scoped_resource.hpp"
@@ -33,7 +29,6 @@
#include "team.hpp"
#include "unit_types.hpp"
#include "unit.hpp"
-#include "video.hpp"
#include "widgets/button.hpp"
#include "widgets/textbox.hpp"
Index: wesnoth/src/replay.cpp
diff -u wesnoth/src/replay.cpp:1.94 wesnoth/src/replay.cpp:1.95
--- wesnoth/src/replay.cpp:1.94 Sat Mar 5 15:39:18 2005
+++ wesnoth/src/replay.cpp Thu Mar 10 20:43:48 2005
@@ -1,4 +1,4 @@
-/* $Id: replay.cpp,v 1.94 2005/03/05 15:39:18 j_daniel Exp $ */
+/* $Id: replay.cpp,v 1.95 2005/03/10 20:43:48 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -17,6 +17,7 @@
#include "ai_interface.hpp"
#include "dialogs.hpp"
#include "game_config.hpp"
+#include "game_events.hpp"
#include "log.hpp"
#include "network.hpp"
#include "pathfind.hpp"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src game_events.cpp playlevel.cpp playl...,
Yann Dirson <=