aboutsummaryrefslogtreecommitdiff
path: root/engines/cge/game.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/cge/game.cpp')
-rw-r--r--engines/cge/game.cpp118
1 files changed, 46 insertions, 72 deletions
diff --git a/engines/cge/game.cpp b/engines/cge/game.cpp
index 86e1324e0b..25af315d98 100644
--- a/engines/cge/game.cpp
+++ b/engines/cge/game.cpp
@@ -25,96 +25,70 @@
* Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
*/
-#include "cge/game.h"
-#include "cge/mouse.h"
-#include <stdlib.h>
-#include <dos.h>
+#include "cge/game.h"
+#include "cge/mouse.h"
+#include <stdlib.h>
+#include <dos.h>
namespace CGE {
-
-
-uint8 * Glass (DAC * pal, uint8 r, uint8 g, uint8 b)
-{
- uint8 * x = new uint8[256];
- if (x)
- {
- uint16 i;
- for (i = 0; i < 256; i ++)
- {
- x[i] = Closest(pal, MkDAC(((uint16)(pal[i].R) * r) / 255,
- ((uint16)(pal[i].G) * g) / 255,
- ((uint16)(pal[i].B) * b) / 255));
+uint8 *Glass(DAC *pal, uint8 r, uint8 g, uint8 b) {
+ uint8 *x = new uint8[256];
+ if (x) {
+ uint16 i;
+ for (i = 0; i < 256; i ++) {
+ x[i] = Closest(pal, MkDAC(((uint16)(pal[i].R) * r) / 255,
+ ((uint16)(pal[i].G) * g) / 255,
+ ((uint16)(pal[i].B) * b) / 255));
+ }
}
- }
- return x;
+ return x;
}
-
-
-
-uint8 * Mark (DAC * pal)
-{
- #define f(c) (c ^ 63)
- uint8 * x = new uint8[256];
- if (x)
- {
- uint16 i;
- for (i = 0; i < 256; i ++)
- {
- x[i] = Closest(pal, MkDAC(f(pal[i].R),
- f(pal[i].G),
- f(pal[i].B)) );
+uint8 *Mark(DAC *pal) {
+#define f(c) (c ^ 63)
+ uint8 *x = new uint8[256];
+ if (x) {
+ uint16 i;
+ for (i = 0; i < 256; i ++) {
+ x[i] = Closest(pal, MkDAC(f(pal[i].R),
+ f(pal[i].G),
+ f(pal[i].B)));
+ }
}
- }
- return x;
- #undef f
+ return x;
+#undef f
}
+int FLY::L = 20,
+ FLY::T = 40,
+ FLY::R = 110,
+ FLY::B = 100;
-
-//--------------------------------------------------------------------------
-
-
-
-int FLY::L = 20,
- FLY::T = 40,
- FLY::R = 110,
- FLY::B = 100;
-
-
-
-FLY::FLY (BITMAP ** shpl)
-: SPRITE(shpl), Tx(0), Ty(0)
-{
- Step(new_random(2));
- Goto(L + new_random(R - L - W), T + new_random(B - T - H));
+FLY::FLY(BITMAP **shpl)
+ : SPRITE(shpl), Tx(0), Ty(0) {
+ Step(new_random(2));
+ Goto(L + new_random(R - L - W), T + new_random(B - T - H));
}
-
-
-void FLY::Tick (void)
-{
- Step();
- if (! Flags.Kept)
- {
- if (new_random(10) < 1)
- {
- Tx = new_random(3) - 1;
- Ty = new_random(3) - 1;
+void FLY::Tick(void) {
+ Step();
+ if (! Flags.Kept) {
+ if (new_random(10) < 1) {
+ Tx = new_random(3) - 1;
+ Ty = new_random(3) - 1;
+ }
+ if (X + Tx < L || X + Tx + W > R)
+ Tx = -Tx;
+ if (Y + Ty < T || Y + Ty + H > B)
+ Ty = -Ty;
+ Goto(X + Tx, Y + Ty);
}
- if (X + Tx < L || X + Tx + W > R) Tx = -Tx;
- if (Y + Ty < T || Y + Ty + H > B) Ty = -Ty;
- Goto(X + Tx, Y + Ty);
- }
}
-
-//--------------------------------------------------------------------------
-
} // End of namespace CGE