1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
diff -ru games-0.6.1-orig/Makefile games-0.6.1/Makefile
--- games-0.6.1-orig/Makefile 2005-11-20 16:53:33.000000000 +0100
+++ games-0.6.1/Makefile 2005-11-20 16:53:41.000000000 +0100
@@ -13,7 +13,7 @@
VDROBJS = plugin.o
SDLOBJS = main.o
DEFINES = -DVERSION=\"$(VERSION)\"
-CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
+#CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
LFLAGS = -pthread
VDRDIR = ../../..
LIBDIR = ../../lib
diff -ru games-0.6.1-orig/minesweeper/Makefile games-0.6.1/minesweeper/Makefile
--- games-0.6.1-orig/minesweeper/Makefile 2005-11-20 16:53:33.000000000 +0100
+++ games-0.6.1/minesweeper/Makefile 2005-11-20 16:54:19.000000000 +0100
@@ -1,6 +1,6 @@
GAME = minesweeper
OBJS = minesweeper.o
-CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
+#CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
all: $(OBJS)
@ar -r $(GAME).a $(OBJS)
diff -ru games-0.6.1-orig/minesweeper/minesweeper.cpp games-0.6.1/minesweeper/minesweeper.cpp
--- games-0.6.1-orig/minesweeper/minesweeper.cpp 2005-11-20 16:53:33.000000000 +0100
+++ games-0.6.1/minesweeper/minesweeper.cpp 2005-11-20 16:53:41.000000000 +0100
@@ -81,7 +81,7 @@
for (int j=0; j<SIZE; j++) {
for (int i=0; i<SIZE; i++) {
- Dpy::pixel_set(a+i, b+j, icon[field[x][y]][j][i]);
+ Dpy::pixel_set(a+i, b+j, icon[(int)field[x][y]][j][i]);
}
}
}
diff -ru games-0.6.1-orig/plugin.cpp games-0.6.1/plugin.cpp
--- games-0.6.1-orig/plugin.cpp 2005-11-20 16:53:33.000000000 +0100
+++ games-0.6.1/plugin.cpp 2005-11-20 16:53:41.000000000 +0100
@@ -1,5 +1,5 @@
-#include <plugin.h>
-#include <osd.h>
+#include <vdr/plugin.h>
+#include <vdr/osd.h>
extern int launcher_menu(char ***m);
extern int launcher_start(int g, int x, int y, int s, int c);
diff -ru games-0.6.1-orig/screen.cpp games-0.6.1/screen.cpp
--- games-0.6.1-orig/screen.cpp 2005-11-20 16:53:33.000000000 +0100
+++ games-0.6.1/screen.cpp 2005-11-20 16:53:41.000000000 +0100
@@ -5,7 +5,7 @@
#ifdef SDL
#include <SDL.h>
#else
- #include <osd.h>
+ #include <vdr/osd.h>
#endif
#include "defines.h"
diff -ru games-0.6.1-orig/snake/Makefile games-0.6.1/snake/Makefile
--- games-0.6.1-orig/snake/Makefile 2005-11-20 16:53:33.000000000 +0100
+++ games-0.6.1/snake/Makefile 2005-11-20 16:54:12.000000000 +0100
@@ -1,6 +1,6 @@
GAME = snake
OBJS = snake.o
-CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
+#CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
all: $(OBJS)
@ar -r $(GAME).a $(OBJS)
diff -ru games-0.6.1-orig/tetris/Makefile games-0.6.1/tetris/Makefile
--- games-0.6.1-orig/tetris/Makefile 2005-11-20 16:53:33.000000000 +0100
+++ games-0.6.1/tetris/Makefile 2005-11-20 16:54:06.000000000 +0100
@@ -1,6 +1,6 @@
GAME = tetris
OBJS = tetris.o
-CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
+#CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
all: $(OBJS)
@ar -r $(GAME).a $(OBJS)
diff -ru games-0.6.1-orig/tictactoe/Makefile games-0.6.1/tictactoe/Makefile
--- games-0.6.1-orig/tictactoe/Makefile 2005-11-20 16:53:33.000000000 +0100
+++ games-0.6.1/tictactoe/Makefile 2005-11-20 16:54:15.000000000 +0100
@@ -1,6 +1,6 @@
GAME = tictactoe
OBJS = tictactoe.o
-CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
+#CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
all: $(OBJS)
@ar -r $(GAME).a $(OBJS)
diff -ru games-0.6.1-orig/tron/Makefile games-0.6.1/tron/Makefile
--- games-0.6.1-orig/tron/Makefile 2005-11-20 16:53:33.000000000 +0100
+++ games-0.6.1/tron/Makefile 2005-11-20 16:53:55.000000000 +0100
@@ -1,6 +1,6 @@
GAME = tron
OBJS = tron.o
-CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
+#CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
all: $(OBJS)
@ar -r $(GAME).a $(OBJS)
diff -ru games-0.6.1-orig/plugin.cpp games-0.6.1/plugin.cpp
--- games-0.6.1-orig/plugin.cpp 2006-03-01 07:48:52.289842000 +0100
+++ games-0.6.1/plugin.cpp 2006-03-01 07:53:03.941569250 +0100
@@ -108,8 +108,9 @@
eOSState
GameStart::ProcessKey(eKeys k) {
- if (r) (int)k &= 0x7fff;
- if (launcher_key((int)k)) return (osEnd);
+ int _k = k;
+ if (r) _k &= 0x7fff;
+ if (launcher_key(_k)) return (osEnd);
return (osContinue);
}
|
GitWeb