diff options
Diffstat (limited to 'apps/plugins/doom/p_saveg.c')
-rw-r--r-- | apps/plugins/doom/p_saveg.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/apps/plugins/doom/p_saveg.c b/apps/plugins/doom/p_saveg.c index 7d012c7f76..b1b4b934ba 100644 --- a/apps/plugins/doom/p_saveg.c +++ b/apps/plugins/doom/p_saveg.c | |||
@@ -95,7 +95,7 @@ void P_UnArchivePlayers (void) | |||
95 | for (j=0 ; j<NUMPSPRITES ; j++) | 95 | for (j=0 ; j<NUMPSPRITES ; j++) |
96 | if (players[i]. psprites[j].state) | 96 | if (players[i]. psprites[j].state) |
97 | players[i]. psprites[j].state = | 97 | players[i]. psprites[j].state = |
98 | &states[ (int)players[i].psprites[j].state ]; | 98 | &states[ (unsigned long)players[i].psprites[j].state ]; |
99 | } | 99 | } |
100 | } | 100 | } |
101 | 101 | ||
@@ -447,10 +447,10 @@ void P_UnArchiveThinkers (void) | |||
447 | PADSAVEP(); | 447 | PADSAVEP(); |
448 | memcpy (mobj, save_p, sizeof(mobj_t)); | 448 | memcpy (mobj, save_p, sizeof(mobj_t)); |
449 | save_p += sizeof(mobj_t); | 449 | save_p += sizeof(mobj_t); |
450 | mobj->state = states + (int) mobj->state; | 450 | mobj->state = states + (unsigned long) mobj->state; |
451 | 451 | ||
452 | if (mobj->player) | 452 | if (mobj->player) |
453 | (mobj->player = &players[(int) mobj->player - 1]) -> mo = mobj; | 453 | (mobj->player = &players[(unsigned long) mobj->player - 1]) -> mo = mobj; |
454 | 454 | ||
455 | P_SetThingPosition (mobj); | 455 | P_SetThingPosition (mobj); |
456 | mobj->info = &mobjinfo[mobj->type]; | 456 | mobj->info = &mobjinfo[mobj->type]; |
@@ -768,7 +768,7 @@ void P_UnArchiveSpecials (void) | |||
768 | ceiling_t *ceiling = Z_Malloc (sizeof(*ceiling), PU_LEVEL, NULL); | 768 | ceiling_t *ceiling = Z_Malloc (sizeof(*ceiling), PU_LEVEL, NULL); |
769 | memcpy (ceiling, save_p, sizeof(*ceiling)); | 769 | memcpy (ceiling, save_p, sizeof(*ceiling)); |
770 | save_p += sizeof(*ceiling); | 770 | save_p += sizeof(*ceiling); |
771 | ceiling->sector = §ors[(int)ceiling->sector]; | 771 | ceiling->sector = §ors[(unsigned long)ceiling->sector]; |
772 | ceiling->sector->ceilingdata = ceiling; //jff 2/22/98 | 772 | ceiling->sector->ceilingdata = ceiling; //jff 2/22/98 |
773 | 773 | ||
774 | if (ceiling->thinker.function) | 774 | if (ceiling->thinker.function) |
@@ -785,10 +785,10 @@ void P_UnArchiveSpecials (void) | |||
785 | vldoor_t *door = Z_Malloc (sizeof(*door), PU_LEVEL, NULL); | 785 | vldoor_t *door = Z_Malloc (sizeof(*door), PU_LEVEL, NULL); |
786 | memcpy (door, save_p, sizeof(*door)); | 786 | memcpy (door, save_p, sizeof(*door)); |
787 | save_p += sizeof(*door); | 787 | save_p += sizeof(*door); |
788 | door->sector = §ors[(int)door->sector]; | 788 | door->sector = §ors[(unsigned long)door->sector]; |
789 | 789 | ||
790 | //jff 1/31/98 unarchive line remembered by door as well | 790 | //jff 1/31/98 unarchive line remembered by door as well |
791 | door->line = (int)door->line!=-1? &lines[(int)door->line] : NULL; | 791 | door->line = (unsigned long)door->line!=-1? &lines[(unsigned long)door->line] : NULL; |
792 | 792 | ||
793 | door->sector->ceilingdata = door; //jff 2/22/98 | 793 | door->sector->ceilingdata = door; //jff 2/22/98 |
794 | door->thinker.function = T_VerticalDoor; | 794 | door->thinker.function = T_VerticalDoor; |
@@ -802,7 +802,7 @@ void P_UnArchiveSpecials (void) | |||
802 | floormove_t *floor = Z_Malloc (sizeof(*floor), PU_LEVEL, NULL); | 802 | floormove_t *floor = Z_Malloc (sizeof(*floor), PU_LEVEL, NULL); |
803 | memcpy (floor, save_p, sizeof(*floor)); | 803 | memcpy (floor, save_p, sizeof(*floor)); |
804 | save_p += sizeof(*floor); | 804 | save_p += sizeof(*floor); |
805 | floor->sector = §ors[(int)floor->sector]; | 805 | floor->sector = §ors[(unsigned long)floor->sector]; |
806 | floor->sector->floordata = floor; //jff 2/22/98 | 806 | floor->sector->floordata = floor; //jff 2/22/98 |
807 | floor->thinker.function = T_MoveFloor; | 807 | floor->thinker.function = T_MoveFloor; |
808 | P_AddThinker (&floor->thinker); | 808 | P_AddThinker (&floor->thinker); |
@@ -815,7 +815,7 @@ void P_UnArchiveSpecials (void) | |||
815 | plat_t *plat = Z_Malloc (sizeof(*plat), PU_LEVEL, NULL); | 815 | plat_t *plat = Z_Malloc (sizeof(*plat), PU_LEVEL, NULL); |
816 | memcpy (plat, save_p, sizeof(*plat)); | 816 | memcpy (plat, save_p, sizeof(*plat)); |
817 | save_p += sizeof(*plat); | 817 | save_p += sizeof(*plat); |
818 | plat->sector = §ors[(int)plat->sector]; | 818 | plat->sector = §ors[(unsigned long)plat->sector]; |
819 | plat->sector->floordata = plat; //jff 2/22/98 | 819 | plat->sector->floordata = plat; //jff 2/22/98 |
820 | 820 | ||
821 | if (plat->thinker.function) | 821 | if (plat->thinker.function) |
@@ -832,7 +832,7 @@ void P_UnArchiveSpecials (void) | |||
832 | lightflash_t *flash = Z_Malloc (sizeof(*flash), PU_LEVEL, NULL); | 832 | lightflash_t *flash = Z_Malloc (sizeof(*flash), PU_LEVEL, NULL); |
833 | memcpy (flash, save_p, sizeof(*flash)); | 833 | memcpy (flash, save_p, sizeof(*flash)); |
834 | save_p += sizeof(*flash); | 834 | save_p += sizeof(*flash); |
835 | flash->sector = §ors[(int)flash->sector]; | 835 | flash->sector = §ors[(unsigned long)flash->sector]; |
836 | flash->thinker.function = T_LightFlash; | 836 | flash->thinker.function = T_LightFlash; |
837 | P_AddThinker (&flash->thinker); | 837 | P_AddThinker (&flash->thinker); |
838 | break; | 838 | break; |
@@ -844,7 +844,7 @@ void P_UnArchiveSpecials (void) | |||
844 | strobe_t *strobe = Z_Malloc (sizeof(*strobe), PU_LEVEL, NULL); | 844 | strobe_t *strobe = Z_Malloc (sizeof(*strobe), PU_LEVEL, NULL); |
845 | memcpy (strobe, save_p, sizeof(*strobe)); | 845 | memcpy (strobe, save_p, sizeof(*strobe)); |
846 | save_p += sizeof(*strobe); | 846 | save_p += sizeof(*strobe); |
847 | strobe->sector = §ors[(int)strobe->sector]; | 847 | strobe->sector = §ors[(unsigned long)strobe->sector]; |
848 | strobe->thinker.function = T_StrobeFlash; | 848 | strobe->thinker.function = T_StrobeFlash; |
849 | P_AddThinker (&strobe->thinker); | 849 | P_AddThinker (&strobe->thinker); |
850 | break; | 850 | break; |
@@ -856,7 +856,7 @@ void P_UnArchiveSpecials (void) | |||
856 | glow_t *glow = Z_Malloc (sizeof(*glow), PU_LEVEL, NULL); | 856 | glow_t *glow = Z_Malloc (sizeof(*glow), PU_LEVEL, NULL); |
857 | memcpy (glow, save_p, sizeof(*glow)); | 857 | memcpy (glow, save_p, sizeof(*glow)); |
858 | save_p += sizeof(*glow); | 858 | save_p += sizeof(*glow); |
859 | glow->sector = §ors[(int)glow->sector]; | 859 | glow->sector = §ors[(unsigned long)glow->sector]; |
860 | glow->thinker.function = T_Glow; | 860 | glow->thinker.function = T_Glow; |
861 | P_AddThinker (&glow->thinker); | 861 | P_AddThinker (&glow->thinker); |
862 | break; | 862 | break; |
@@ -868,7 +868,7 @@ void P_UnArchiveSpecials (void) | |||
868 | fireflicker_t *flicker = Z_Malloc (sizeof(*flicker), PU_LEVEL, NULL); | 868 | fireflicker_t *flicker = Z_Malloc (sizeof(*flicker), PU_LEVEL, NULL); |
869 | memcpy (flicker, save_p, sizeof(*flicker)); | 869 | memcpy (flicker, save_p, sizeof(*flicker)); |
870 | save_p += sizeof(*flicker); | 870 | save_p += sizeof(*flicker); |
871 | flicker->sector = §ors[(int)flicker->sector]; | 871 | flicker->sector = §ors[(unsigned long)flicker->sector]; |
872 | flicker->thinker.function = T_FireFlicker; | 872 | flicker->thinker.function = T_FireFlicker; |
873 | P_AddThinker (&flicker->thinker); | 873 | P_AddThinker (&flicker->thinker); |
874 | break; | 874 | break; |
@@ -881,7 +881,7 @@ void P_UnArchiveSpecials (void) | |||
881 | elevator_t *elevator = Z_Malloc (sizeof(*elevator), PU_LEVEL, NULL); | 881 | elevator_t *elevator = Z_Malloc (sizeof(*elevator), PU_LEVEL, NULL); |
882 | memcpy (elevator, save_p, sizeof(*elevator)); | 882 | memcpy (elevator, save_p, sizeof(*elevator)); |
883 | save_p += sizeof(*elevator); | 883 | save_p += sizeof(*elevator); |
884 | elevator->sector = §ors[(int)elevator->sector]; | 884 | elevator->sector = §ors[(unsigned long)elevator->sector]; |
885 | elevator->sector->floordata = elevator; //jff 2/22/98 | 885 | elevator->sector->floordata = elevator; //jff 2/22/98 |
886 | elevator->sector->ceilingdata = elevator; //jff 2/22/98 | 886 | elevator->sector->ceilingdata = elevator; //jff 2/22/98 |
887 | elevator->thinker.function = T_MoveElevator; | 887 | elevator->thinker.function = T_MoveElevator; |