X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fplasma.c;h=c20ff63c0033c6edd0e5ee4903212cf16d608eef;hb=45f6f46fe758d15aafccdb69ae837fc7d84ee466;hp=063fb7864dcb965e3fe26afafd65da2c45932eb6;hpb=c4ab9e55c5456d4481dd3fd5f5a3e9df74cf07c6;p=dosdemo diff --git a/src/plasma.c b/src/plasma.c index 063fb78..c20ff63 100644 --- 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,7 +64,6 @@ static int init(void) plasmaPal[i] = (r<<11) | (g<<5) | b; } - //return 0xCAFE; return 0; } @@ -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; @@ -116,7 +107,5 @@ static void draw(void) } } - drawFps((unsigned short*)fb_pixels); - swap_buffers(0); }