aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Kołodziejski2006-05-24 08:56:40 +0000
committerPaweł Kołodziejski2006-05-24 08:56:40 +0000
commita62c66bea1bc8e0105b3ce3ff1ab453a24e651d7 (patch)
tree94e70aece02718525d5731e7a2a3911259fa53d2
parent04bf1294167fbaa1f193a3b105ebdd25ae07136d (diff)
downloadscummvm-rg350-a62c66bea1bc8e0105b3ce3ff1ab453a24e651d7.tar.gz
scummvm-rg350-a62c66bea1bc8e0105b3ce3ff1ab453a24e651d7.tar.bz2
scummvm-rg350-a62c66bea1bc8e0105b3ce3ff1ab453a24e651d7.zip
strip one level of func
svn-id: r22601
-rw-r--r--engines/agi/graphics.cpp9
-rw-r--r--engines/agi/graphics.h1
2 files changed, 2 insertions, 8 deletions
diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp
index fbe0228efa..1d7f864cc3 100644
--- a/engines/agi/graphics.cpp
+++ b/engines/agi/graphics.cpp
@@ -151,7 +151,7 @@ static void put_pixels(const int x, const int y, const int w, uint8 *p) {
uint8 *b, *c = NULL;
if (console.y <= y) {
- gfx_putpixels(x, y, w, p);
+ memcpy(screen + x + y * 320, p, w);
return;
}
@@ -162,7 +162,7 @@ static void put_pixels(const int x, const int y, const int w, uint8 *p) {
*b++ = *c ? *c : *p + 16;
}
- gfx_putpixels(x, y, w, _b);
+ memcpy(screen + x + y * 320, p, w);
}
static void init_console() {
@@ -434,11 +434,6 @@ void gfx_set_palette() {
g_system->setPalette(pal, 0, 32);
}
-void gfx_putpixels(int x, int y, int w, uint8 *p) {
- uint8 *p0 = screen + x + y * 320;
- memcpy(p0, p, w);
-}
-
/* put a block onto the screen */
void gfx_putblock(int x1, int y1, int x2, int y2) {
if (x1 >= GFX_WIDTH)
diff --git a/engines/agi/graphics.h b/engines/agi/graphics.h
index 3931677441..c85ad6dc76 100644
--- a/engines/agi/graphics.h
+++ b/engines/agi/graphics.h
@@ -42,7 +42,6 @@ extern uint8 palette[];
extern uint8 layer1_data[];
extern uint8 layer2_data[];
-void gfx_putpixels(int x, int y, int w, uint8 * p);
void gfx_putblock(int x1, int y1, int x2, int y2);
void put_text_character(int, int, int, unsigned int, int, int);