git » fp-git.git » commit 71754fc

finished the edge offset task

author ecalot
2004-08-18 08:44:30 UTC
committer ecalot
2004-08-18 08:44:30 UTC
parent 97fa2d4750ea369150b37cce4099110cf5d7b249

finished the edge offset task

FP/src/conf/resources.conf +3 -3
FP/src/out/output.c +4 -3

diff --git a/FP/src/conf/resources.conf b/FP/src/conf/resources.conf
index e6b9cb5..8be05bd 100644
--- a/FP/src/conf/resources.conf
+++ b/FP/src/conf/resources.conf
@@ -10,9 +10,9 @@ ANIM_CROUCH          IMG KID     400 518-530
 ANIM_JUMP            IMG KID     400 481-499
 
 #jump run with offsets
-ANIM_JUMPRUN_XD      OFD         0 0 1 0 0 1 0 1 1 1 1
-ANIM_JUMPRUN_XL      OFL         1 0 1 0 0 1 0 1 1 1 1
-ANIM_JUMPRUN_XR      OFR         0 0 1 0 0 1 0 1 1 1 1 
+ANIM_JUMPRUN_XD      OFD         0 0 1 2 4 6 7 6 4 2 1
+ANIM_JUMPRUN_XL      OFL         0 0 0 0 0 0 0 0 0 0 0
+ANIM_JUMPRUN_XR      OFR         0 0 0 0 0 0 0 0 0 0 0 
 ANIM_JUMPRUN         IMG KID     400 434-444
 
 ANIM_NORMAL          IMG KID     400 415 415 415 
diff --git a/FP/src/out/output.c b/FP/src/out/output.c
index 1efa500..206bf38 100644
--- a/FP/src/out/output.c
+++ b/FP/src/out/output.c
@@ -167,10 +167,11 @@ void outputFreeBitmap(void* image) {
 /* Graphics: Primitives for the kernel */
 void outputDrawBitmap(void* image, int x, int y) {
 	/* Draws an abstract image */
-	SDL_Surface *s = ((tSurface*)image)->surface;
+	tSurface* img=(tSurface*)image;
+	SDL_Surface *s = img->surface;
 	SDL_Rect dest;
-	dest.x = x;
-	dest.y = y-s->h;
+	dest.x = x+img->left;
+	dest.y = y-s->h-img->bottom;
 	dest.w = s->w;
 	dest.h = s->h;
 	if (SDL_MUSTLOCK(screen)) SDL_LockSurface(screen);