← Back to branch summary

~ubuntu-branches/ubuntu/karmic/rott/karmic-proposed

« back to all changes in this revision

Viewing changes to debian/patches/31-svn-211.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Fabian Greffrath
  • Date: 2008-01-27 20:00:00 UTC
  • mfrom: (1.1.1 upstream) (2.1.2 hardy)
  • Revision ID: james.westby@ubuntu.com-20080127200000-myle9y0099o45sfv
Tags: 1.0+dfsg-2
* debian/patches/01-custom-datapath.dpatch,
  debian/patches/13-improve-makefile.dpatch:
  + Changed DATADIR back to "/usr/share/games/rott/".

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/31-svn-211.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## r211 | relnev | 2003-01-10 10:24:15 +0100 (Fr, 10 Jan 2003) | 2 lines
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: added keyboard updates
 
6
 
 
7
@DPATCH@
 
8
diff -urNad rott-1.0+dfsg~/isr.c rott-1.0+dfsg/isr.c
 
9
--- rott-1.0+dfsg~/isr.c        2008-01-09 13:52:28.000000000 +0100
 
10
+++ rott-1.0+dfsg/isr.c 2008-01-10 09:20:46.000000000 +0100
 
11
@@ -801,10 +801,9 @@
 
12
    delay=(VBLCOUNTER*delay)/10;
 
13
    IN_ClearKeysDown();
 
14
    time=GetTicCount();
 
15
-   while (GetTicCount()<time+delay)
 
16
+   while (!LastScan && GetTicCount()<time+delay)
 
17
       {
 
18
-      if (LastScan)
 
19
-         break;
 
20
+       IN_UpdateKeyboard();
 
21
       }
 
22
 }
 
23
 
 
24
diff -urNad rott-1.0+dfsg~/rt_menu.c rott-1.0+dfsg/rt_menu.c
 
25
--- rott-1.0+dfsg~/rt_menu.c    2008-01-10 09:20:45.000000000 +0100
 
26
+++ rott-1.0+dfsg/rt_menu.c     2008-01-10 09:20:46.000000000 +0100
 
27
@@ -2948,10 +2948,10 @@
 
28
       LastScan=0;
 
29
       while (LastScan == 0)
 
30
          {
 
31
+         IN_UpdateKeyboard();
 
32
          RefreshMenuBuf( 0 );
 
33
          }
 
34
       LastScan = 0;
 
35
-      IN_UpdateKeyboard();
 
36
    }
 
37
    IN_ClearKeysDown();
 
38
    return( retval );
 
39
diff -urNad rott-1.0+dfsg~/rt_str.c rott-1.0+dfsg/rt_str.c
 
40
--- rott-1.0+dfsg~/rt_str.c     2008-01-10 09:20:44.000000000 +0100
 
41
+++ rott-1.0+dfsg/rt_str.c      2008-01-10 09:20:46.000000000 +0100
 
42
@@ -1109,6 +1109,8 @@
 
43
 //      if (GameEscaped == true)
 
44
 //         PauseLoop ();
 
45
 
 
46
+      IN_PumpEvents();
 
47
+      
 
48
       if (cursorvis)
 
49
          USL_XORICursor (x, y, xx, cursor, color);
 
50