[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src pingus_counter_bar.cxx,1.1,1.2 plf.cx
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src pingus_counter_bar.cxx,1.1,1.2 plf.cxx,1.6,1.7 server.cxx,1.15,1.16 |
Date: |
14 Sep 2002 23:47:00 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv18494
Modified Files:
pingus_counter_bar.cxx plf.cxx server.cxx
Log Message:
- removed some commented out things
Index: pingus_counter_bar.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_counter_bar.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pingus_counter_bar.cxx 12 Jun 2002 19:06:12 -0000 1.1
+++ pingus_counter_bar.cxx 14 Sep 2002 23:46:58 -0000 1.2
@@ -17,16 +17,12 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include <ClanLib/Display/Display/display.h>
#include "pingus_counter_bar.hxx"
#include "server.hxx"
#include "world.hxx"
-std::ostream& operator<<(std::ostream& s, const CL_Rect& rect)
-{
- return s << "[" << rect.x1 << ", " << rect.y1 << ", " << rect.x2 << ", " <<
rect.y2 << "]";
-}
-
PingusCounterBar::PingusCounterBar (Server * s, Orientation o, const CL_Rect&
arg_rect)
: server (s),
orientation (o),
@@ -46,8 +42,6 @@
void
PingusCounterBar::draw ()
{
- //std::cout << "Drawing Clip: " << x1 << " " << y1 << " " << x2 << " " << y2
<< std::endl;
-
int length = rect.y2 - rect.y1;
int complete = server->get_world ()->get_allowed_pingus ();
Index: plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plf.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- plf.cxx 14 Sep 2002 23:31:12 -0000 1.6
+++ plf.cxx 14 Sep 2002 23:46:58 -0000 1.7
@@ -35,8 +35,6 @@
difficulty = 5;
playable = false;
music = ResDescriptor("file", "pingus-4.it");
- //maptype = SPOT;
- foreground.type = ResDescriptor::RD_FILE;
}
// Destroy all data
@@ -49,58 +47,6 @@
delete *i;
}
}
-/*
-vector<shared_ptr<BackgroundData> >
-PLF::get_backgrounds()
-{
- return backgrounds;
-}*/
-/*
-ResDescriptor
-PLF::get_foreground()
-{
- if (!psm_filename.empty()) {
- return ResDescriptor("file", psm_filename);
- } else {
- ResDescriptor ret_val = foreground;
-
- switch(foreground.type) {
- case ResDescriptor::RD_FILE:
- ret_val.res_name = "levels/" + foreground.res_name;
- break;
- case ResDescriptor::RD_RESOURCE:
- if (verbose > 1) std::cout << "Not supported" << endl;
- break;
- default:
- assert(false);
- break;
- }
- return ret_val;
- }
-}
-*/
-/*
-MapType
-PLF::map_type()
-{
- return maptype;
-}
-*/
-/*
-ResDescriptor
-PLF::get_mapfile()
-{
- switch(col.type) {
- case ResDescriptor::RD_FILE:
- col.res_name = "levels/" + col.res_name;
- break;
- case ResDescriptor::RD_RESOURCE:
- break;
- default:
- break;
- }
- return col;
-}*/
int
PLF::get_startx()
@@ -198,12 +144,6 @@
{
return author;
}
-
-/*void
-PLF::set_psm_filename(string name)
-{
- psm_filename = name;
-}*/
std::vector<GroundpieceData>
PLF::get_groundpieces(void)
Index: server.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/server.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- server.cxx 14 Sep 2002 23:40:35 -0000 1.15
+++ server.cxx 14 Sep 2002 23:46:58 -0000 1.16
@@ -123,7 +123,6 @@
void
Server::send_event(std::string event)
{
- recorder.queue_event(to_string(world->get_game_time ()->get_ticks()) + ":" +
event);
process_event(event);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src pingus_counter_bar.cxx,1.1,1.2 plf.cxx,1.6,1.7 server.cxx,1.15,1.16,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src demo_player.cxx,1.3,1.4 plf.hxx,1.4,1.5 server.cxx,1.14,1.15 server.hxx,1.5,1.6 true_server.cxx,1.7,1.8
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src system.cxx,1.5,1.6 system.hxx,1.4,1.5
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src demo_player.cxx,1.3,1.4 plf.hxx,1.4,1.5 server.cxx,1.14,1.15 server.hxx,1.5,1.6 true_server.cxx,1.7,1.8
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src system.cxx,1.5,1.6 system.hxx,1.4,1.5
- Index(es):