projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2d57e3c
)
rnd-20001025-1-src
author
Holger Schemel
<info@artsoft.org>
Wed, 25 Oct 2000 21:43:51 +0000
(23:43 +0200)
committer
Holger Schemel
<info@artsoft.org>
Sat, 30 Aug 2014 08:35:00 +0000
(10:35 +0200)
src/game.c
patch
|
blob
|
history
src/sdl.c
patch
|
blob
|
history
diff --git
a/src/game.c
b/src/game.c
index 0b731c327dc35ad1276082b0193367580f70fac3..63bf4b001004a842bb9dde0c7faa7596672ec6f8 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-513,7
+513,6
@@
void InitGame()
ZX = ZY = -1;
ZX = ZY = -1;
- game.yam_content_nr = 0;
FrameCounter = 0;
TimeFrames = 0;
TimePlayed = 0;
FrameCounter = 0;
TimeFrames = 0;
TimePlayed = 0;
@@
-526,6
+525,8
@@
void InitGame()
ScrollStepSize = 0; /* will be correctly initialized by ScrollScreen() */
AllPlayersGone = FALSE;
ScrollStepSize = 0; /* will be correctly initialized by ScrollScreen() */
AllPlayersGone = FALSE;
+
+ game.yam_content_nr = 0;
game.magic_wall_active = FALSE;
game.magic_wall_time_left = 0;
game.light_time_left = 0;
game.magic_wall_active = FALSE;
game.magic_wall_time_left = 0;
game.light_time_left = 0;
diff --git
a/src/sdl.c
b/src/sdl.c
index e573d3637458592d200bcb56afcf9e1064ce5321..941904e77a761836385211ee1e6781028f389c26 100644
(file)
--- a/
src/sdl.c
+++ b/
src/sdl.c
@@
-44,9
+44,9
@@
inline void SDLFillRectangle(SDL_Surface *surface, int x, int y,
int width, int height, unsigned int color)
{
SDL_Rect rect;
int width, int height, unsigned int color)
{
SDL_Rect rect;
- unsigned int color_r = (color >>
2
) && 0xff;
- unsigned int color_g = (color >>
1
) && 0xff;
- unsigned int color_b = (color >> 0) && 0xff;
+ unsigned int color_r = (color >>
16
) && 0xff;
+ unsigned int color_g = (color >>
8
) && 0xff;
+ unsigned int color_b = (color >>
0) && 0xff;
rect.x = x;
rect.y = y;
rect.x = x;
rect.y = y;
@@
-62,9
+62,9
@@
inline void SDLDrawSimpleLine(SDL_Surface *surface, int from_x, int from_y,
int to_x, int to_y, unsigned int color)
{
SDL_Rect rect;
int to_x, int to_y, unsigned int color)
{
SDL_Rect rect;
- unsigned int color_r = (color >>
2
) & 0xff;
- unsigned int color_g = (color >>
1
) & 0xff;
- unsigned int color_b = (color >> 0) & 0xff;
+ unsigned int color_r = (color >>
16
) & 0xff;
+ unsigned int color_g = (color >>
8
) & 0xff;
+ unsigned int color_b = (color >>
0) & 0xff;
if (from_x > to_x)
swap_numbers(&from_x, &to_x);
if (from_x > to_x)
swap_numbers(&from_x, &to_x);