From a8e1e336053156e5e4f4339af8a8d18a211d5fb6 Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 5 Sep 2010 18:34:25 +0100 Subject: [PATCH] Heat fix --- main.c | 3 ++- powder.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/main.c b/main.c index 833a4688d..854fbf369 100644 --- a/main.c +++ b/main.c @@ -592,7 +592,7 @@ int parse_save(void *save, int size, int replace, int x0, int y0) if(ver>=42){ parts[i-1].temp = (d[p++]*((MAX_TEMP+(-MIN_TEMP))/255))+MIN_TEMP; } else { - parts[i-1].temp = ((d[p++]*(((3500.0f)+(-(-273)))/255))+(-273)) + 273.15f; + parts[i-1].temp = ((d[p++]*((O_MAX_TEMP+(-O_MIN_TEMP))/255))+O_MIN_TEMP)+273; } } else @@ -1985,6 +1985,7 @@ int main(int argc, char *argv[]) { #ifdef BETA sprintf(uitext, "Version %d (Beta %d) FPS:%d", SAVE_VERSION, MINOR_VERSION, FPS); + //printf("%s\n", uitext); #else sprintf(uitext, "Version %d.%d FPS:%d", SAVE_VERSION, MINOR_VERSION, FPS); #endif diff --git a/powder.h b/powder.h index b69ec5b75..e2ba4d2a5 100644 --- a/powder.h +++ b/powder.h @@ -109,6 +109,8 @@ #define R_TEMP 22 #define MAX_TEMP 9999 #define MIN_TEMP 0 +#define O_MAX_TEMP 3500 +#define O_MIN_TEMP -273 #define ST_NONE 0 #define ST_SOLID 1