diff --git a/src/view.c b/src/view.c
index 77985e1ce06cc24bac80ac833ab0755e5b195d20..6a8132996c3d632302621c66cd908bde5c45453a 100644 (file)
--- a/src/view.c
+++ b/src/view.c
#include "my.h"
#include "render.h"
#include "my.h"
#include "render.h"
-byte w_horiz=ON;
int sky_type=1;
dword walf[256];
int sky_type=1;
dword walf[256];
-byte walswp[256];
byte fldb[FLDH][FLDW];
byte fldf[FLDH][FLDW];
byte fld[FLDH][FLDW];
byte fldb[FLDH][FLDW];
byte fldf[FLDH][FLDW];
byte fld[FLDH][FLDW];
-void W_savegame (FILE* h) {
- char s[8];
- int i;
- myfwrite32(sky_type, h);
- for(i = 1; i < 256; ++i) {
- R_get_name(i, s);
- myfwrite(s, 8, 1, h);
- }
- for (i = 0; i < 256; i++) {
- myfwrite32(walf[i], h);
- }
- for (i = 0; i < 256; i++) {
- myfwrite8(walswp[i], h);
- }
- myfwrite(fldb, FLDW*FLDH, 1, h);
- myfwrite(fld, FLDW*FLDH, 1, h);
- myfwrite(fldf, FLDW*FLDH, 1, h);
-}
-
-void W_loadgame (FILE* h) {
- int i;
- char s[256][8];
- sky_type = myfread32(h);
- R_loadsky(sky_type);
- for (i = 1; i < 256; ++i) {
- myfread(s[i], 8, 1, h);
- }
- R_begin_load();
- i = myfread32(h); // ignore
- for (i = 1; i < 256; i++) {
- walf[i] = myfread32(h);
- R_load(s[i], walf[i] & 1);
- }
- for (i = 0; i < 256; i++) {
- //walswp[i] = myfread8(h);
- (void)myfread8(h); // useless in new code
- }
- myfread(fldb, FLDW*FLDH, 1, h);
- myfread(fld, FLDW*FLDH, 1, h);
- myfread(fldf, FLDW*FLDH, 1, h);
- R_end_load();
-}
-
void W_init (void) {
DOT_init();
SMK_init();
void W_init (void) {
DOT_init();
SMK_init();
}
int W_load (FILE *h) {
}
int W_load (FILE *h) {
+ int i;
char s[8];
char s[8];
- int i, j, t;
void *p, *buf;
switch (blk.t) {
case MB_WALLNAMES:
R_begin_load();
void *p, *buf;
switch (blk.t) {
case MB_WALLNAMES:
R_begin_load();
+ memset(walf, 0, sizeof(walf));
for (i = 1; i < 256 && blk.sz > 0; i++, blk.sz -= 9) {
myfread(s, 8, 1, h);
for (i = 1; i < 256 && blk.sz > 0; i++, blk.sz -= 9) {
myfread(s, 8, 1, h);
- t = myfread8(h);
- R_load(s, t);
+ walf[i] = myfread8(h) ? 1 : 0; // ???
+ R_load(s);
if (strncasecmp(s, "VTRAP01", 8) == 0) {
walf[i] |= 2;
}
if (strncasecmp(s, "VTRAP01", 8) == 0) {
walf[i] |= 2;
}