[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src pingus_main.cxx,1.77,1.78 playfield.c
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src pingus_main.cxx,1.77,1.78 playfield.cxx,1.32,1.33 story_screen.cxx,1.16,1.17 |
Date: |
13 Apr 2003 22:00:57 -0000 |
Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv7733
Modified Files:
pingus_main.cxx playfield.cxx story_screen.cxx
Log Message:
inited some uninited variables
Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- pingus_main.cxx 12 Apr 2003 16:14:31 -0000 1.77
+++ pingus_main.cxx 13 Apr 2003 22:00:55 -0000 1.78
@@ -214,7 +214,7 @@
{"level", required_argument, 0, 'l'},
{"worldmap", required_argument, 0, 158},
{"credits", no_argument, 0, 159},
- {"help", no_argument, 0, 'h'},
+ {"help", no_argument, 0, 'h'}, // add -? support
{"version", no_argument, 0, 'V'},
{"verbose", required_argument, 0, 'v'},
{"print-fps", no_argument, 0, 'b'},
@@ -502,7 +502,7 @@
//" --use-datafile Use the pre-compiled datafile
(default)\n"
// " --use-scriptfile Use the scriptfile and read
all data from files\n"
<< "\n -l, --level " << _("FILE ") << _("Load a custom level
from FILE")
- << "\n -w, --worldmap "<< _("FILE ") << _("Load a custom
worldmap from FILE")
+ << "\n --worldmap "<< _("FILE ") << _("Load a custom worldmap
from FILE")
<< "\n -v, --verbose " << _("Print some more messages to
stdout, can be set")
<< "\n " << _("multible times to increase
verbosity")
<< "\n -V, --version " << _("Prints version number and
exit")
Index: playfield.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/playfield.cxx,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- playfield.cxx 10 Apr 2003 18:28:30 -0000 1.32
+++ playfield.cxx 13 Apr 2003 22:00:55 -0000 1.33
@@ -63,6 +63,10 @@
needs_clear_screen = true;
generate_clipping_rects(x1, y1, x2, y2);
}
+ else
+ {
+ needs_clear_screen = false;
+ }
view.push_back(new View(client, x1, y1, x2, y2));
Index: story_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/story_screen.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- story_screen.cxx 10 Apr 2003 17:11:58 -0000 1.16
+++ story_screen.cxx 13 Apr 2003 22:00:55 -0000 1.17
@@ -142,7 +142,7 @@
if (!page_displayed_completly)
{
- int i = Math::min(current_page.text.length(), (unsigned int)(15.0f *
time_passed));
+ int i = Math::min(current_page.text.length(), (unsigned int)(20.0f *
time_passed));
display_text = current_page.text.substr(0, i);
if (current_page.text.length() < (unsigned int)(15.0f * time_passed))
@@ -161,8 +161,7 @@
void
StoryScreen::on_escape_press ()
{
- if (1 /* story_seen */)
-
ScreenManager::instance()->replace_screen(WorldMapNS::WorldMapManager::instance
());
+
ScreenManager::instance()->replace_screen(WorldMapNS::WorldMapManager::instance
());
}
void
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src pingus_main.cxx,1.77,1.78 playfield.cxx,1.32,1.33 story_screen.cxx,1.16,1.17,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldmap pingus.cxx,1.31,1.32 worldmap.cxx,1.44,1.45
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src pingus_main.cxx,1.78,1.79
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldmap pingus.cxx,1.31,1.32 worldmap.cxx,1.44,1.45
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src pingus_main.cxx,1.78,1.79
- Index(es):