[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdegames/kgoldrunner
From:       Jakob Schröter <cvsci () camaya ! net>
Date:       2004-10-11 23:34:27
Message-ID: 20041011233427.626EB16C08 () office ! kde ! org
[Download RAW message or body]

CVS commit by schrot: 

backport:
fix #82584 and #83512


  M +1 -1      gamedata/Makefile.am   1.12.4.1
  M +6 -3      src/kgoldrunner.cpp   1.16.4.1
  M +2 -0      src/kgrgame.cpp   1.17.2.1


--- kdegames/kgoldrunner/gamedata/Makefile.am  #1.12:1.12.4.1
@@ -9,5 +9,5 @@
         pwd=`cd $(srcdir) && pwd` ;\
         cd $(DESTDIR)$(gamedatadir) && tar -xf $$pwd/levels.tar ;\
-        chown -R root.root levels 2> /dev/null || true ;\
+        chown -R root:root levels 2> /dev/null || true ;\
         chmod 644 levels/* 2> /dev/null || true 
 

--- kdegames/kgoldrunner/src/kgoldrunner.cpp  #1.16:1.16.4.1
@@ -939,7 +939,10 @@ void KGoldrunner::setKey (KBAction movem
     }
 
+    if ( game->getLevel() != 0 )
+    {
     if (! hero->started)                        // Start when first movement
         game->startPlaying();                   // key is pressed ...
     game->heroAction (movement);
+    }
 }
 

--- kdegames/kgoldrunner/src/kgrgame.cpp  #1.17:1.17.2.1
@@ -112,4 +112,6 @@ void KGrGame::startLevel (int startingAt
     if (selectedLevel > 0) {    // If OK, start the selected game and level.
         newGame (selectedLevel, selectedGame);
+    } else {
+      level = 0;
     }
 }


[prev in list] [next in list] [prev in thread] [next in thread]