foo

[dosdemo] / src / plasma.c

diff --git a/src/plasma.c b/src/plasma.c
index ac13e6a..5caf4f4 100644 (file)
--- a/src/plasma.c
+++ b/src/plasma.c
@@ -5,12 +5,10 @@
 
 #include "demo.h"
 #include "screen.h"
-#include "tinyfps.h"
 
 static int init(void);
 static void destroy(void);
 static void start(long trans_time);
-static void stop(long trans_time);
 static void draw(void);
 
 static struct screen scr = {
@@ -18,19 +16,19 @@ static struct screen scr = {
        init,
        destroy,
        start,
-       stop,
+       0,
        draw
 };
 
-unsigned long startingTime;
+static unsigned long startingTime;
 
 #define PSIN_SIZE 4096
 #define PPAL_SIZE 256
 
-unsigned char *psin1, *psin2, *psin3;
-unsigned short *plasmaPal;
+static unsigned char *psin1, *psin2, *psin3;
+static unsigned short *plasmaPal;
 
-unsigned short myBuffer[320*240];
+static unsigned short myBuffer[320 * 240];
 
 
 struct screen *plasma_screen(void)
@@ -42,8 +40,6 @@ static int init(void)
 {
        int i;
 
-       initFpsFonts();
-
        psin1 = (unsigned char*)malloc(sizeof(unsigned char) * PSIN_SIZE);
        psin2 = (unsigned char*)malloc(sizeof(unsigned char) * PSIN_SIZE);
        psin3 = (unsigned char*)malloc(sizeof(unsigned char) * PSIN_SIZE);
@@ -68,8 +64,7 @@ static int init(void)
                plasmaPal[i] = (r<<11) | (g<<5) | b;
        }
 
-       return 0xCAFE;
-       //return 0;
+       return 0;
 }
 
 static void destroy(void)
@@ -84,10 +79,6 @@ static void start(long trans_time)
        startingTime = time_msec;
 }
 
-static void stop(long trans_time)
-{
-}
-
 static void draw(void)
 {
        int x, y;
@@ -99,7 +90,7 @@ static void draw(void)
        int t2 = sin(0.2f * dt) * 248 + 248;
        int t3 = sin(0.5f * dt) * 380 + 380;
 
-       unsigned int *vram32 = (unsigned int*)vmem_back;
+       unsigned int *vram32 = (unsigned int*)fb_pixels;
        unsigned int p0, p1;
        for (y = 0; y < fb_height; y++)
        {
@@ -116,7 +107,5 @@ static void draw(void)
                }
        }
 
-       drawFps((unsigned short*)fb_pixels);
-
        swap_buffers(0);
 }