]>
Commit | Line | Data |
---|---|---|
2731beaf JB |
1 | --- d1x/main/gameseg.h.orig Sun Jun 25 10:34:29 2000 |
2 | +++ d1x/main/gameseg.h Sun Jun 2 01:25:12 2002 | |
3 | @@ -170,7 +170,7 @@ | |
4 | segmasks get_seg_masks(vms_vector *checkp,int segnum,fix rad, char *calling_file, int calling_linenum); | |
5 | ||
6 | //this macro returns true if the segnum for an object is correct | |
7 | -#define check_obj_seg(obj) (get_seg_masks(&(obj)->pos,(obj)->segnum,0).centermask == 0) | |
8 | +#define check_obj_seg(obj) (get_seg_masks(&(obj)->pos,(obj)->segnum,0,__FILE__,__LINE__).centermask == 0) | |
9 | ||
10 | //Tries to find a segment for a point, in the following way: | |
11 | // 1. Check the given segment | |
12 | --- d1x/main/gamesave.c.orig Thu Sep 2 15:50:13 1999 | |
13 | +++ d1x/main/gamesave.c Sun Jun 2 01:30:58 2002 | |
14 | @@ -302,6 +302,7 @@ | |
15 | #include "inferno.h" | |
16 | #ifdef EDITOR | |
17 | #include "editor/editor.h" | |
18 | +#include "strutil.h" | |
19 | #endif | |
20 | #include "error.h" | |
21 | #include "object.h" | |
22 | --- d1x/editor/med.c.orig Tue Jun 15 00:03:43 1999 | |
23 | +++ d1x/editor/med.c Sun Jun 2 01:33:50 2002 | |
24 | @@ -765,7 +765,7 @@ | |
25 | ||
26 | int DosShell() | |
27 | { | |
28 | - int ok, w, h; | |
29 | + int w, h; | |
30 | grs_bitmap * save_bitmap; | |
31 | ||
32 | // Save the current graphics state. | |
33 | --- d1x/editor/autosave.c.orig Tue Jun 15 00:02:47 1999 | |
34 | +++ d1x/editor/autosave.c Sun Jun 2 01:35:05 2002 | |
35 | @@ -130,6 +130,7 @@ | |
36 | #include "mono.h" | |
37 | #include "u_mem.h" | |
38 | #include "ui.h" | |
39 | +#include "strutil.h" | |
40 | ||
41 | #define AUTOSAVE_PERIOD 5 // Number of minutes for timed autosave | |
42 | ||
43 | --- d1x/editor/eobject.c.orig Tue Jun 15 00:03:00 1999 | |
44 | +++ d1x/editor/eobject.c Sun Jun 2 01:36:22 2002 | |
45 | @@ -569,7 +569,7 @@ | |
46 | int segnum; | |
47 | ||
48 | for (segnum=0;segnum <= Highest_segment_index; segnum++) { | |
49 | - segmasks result = get_seg_masks(&obj->pos,segnum,0); | |
50 | + segmasks result = get_seg_masks(&obj->pos,segnum,0,__FILE__,__LINE__); | |
51 | if (result.centermask == 0) { | |
52 | int fate; | |
53 | fvi_info hit_info; | |
54 | @@ -604,7 +604,7 @@ | |
55 | // Return 0 if object is in expected segment, else return 1 | |
56 | int verify_object_seg(object *objp, vms_vector *newpos) | |
57 | { | |
58 | - segmasks result = get_seg_masks(newpos, objp->segnum, objp->size); | |
59 | + segmasks result = get_seg_masks(newpos, objp->segnum, objp->size, __FILE__, __LINE__); | |
60 | ||
61 | if (result.facemask == 0) | |
62 | return 0; | |
63 | @@ -974,7 +974,7 @@ | |
64 | { | |
65 | object *objp = &Objects[objnum]; | |
66 | ||
67 | - segmasks result = get_seg_masks(newpos, objp->segnum, objp->size); | |
68 | + segmasks result = get_seg_masks(newpos, objp->segnum, objp->size, __FILE__, __LINE__); | |
69 | ||
70 | if (result.facemask == 0) { | |
71 | //mprintf((0, "Object #%i moved from (%7.3f %7.3f %7.3f) to (%7.3f %7.3f %7.3f)\n", objnum, f2fl(objp->pos.x), f2fl(objp->pos.y), f2fl(objp->pos.z), f2fl(newpos->x), f2fl(newpos->y), f2fl(newpos->z))); | |
72 | --- d1x/editor/kgame.c.orig Tue Jun 15 00:03:24 1999 | |
73 | +++ d1x/editor/kgame.c Sun Jun 2 01:37:10 2002 | |
74 | @@ -177,7 +177,7 @@ | |
75 | Perm_player_segnum = -1; | |
76 | ||
77 | if (Perm_player_segnum!=-1) { | |
78 | - if (get_seg_masks(&Perm_player_position,Perm_player_segnum,0).centermask==0) { | |
79 | + if (get_seg_masks(&Perm_player_position,Perm_player_segnum,0,__FILE__,__LINE__).centermask==0) { | |
80 | ConsoleObject->pos = Perm_player_position; | |
81 | obj_relink(ConsoleObject-Objects,Perm_player_segnum); | |
82 | ConsoleObject->orient = Perm_player_orient; | |
83 | --- d1x/editor/segment.c.orig Thu Sep 2 15:37:06 1999 | |
84 | +++ d1x/editor/segment.c Sun Jun 2 01:38:12 2002 | |
85 | @@ -2223,7 +2223,7 @@ | |
86 | ||
87 | for (i=0;i<=Highest_segment_index; i++) { | |
88 | if (i != segnum) { | |
89 | - masks = get_seg_masks(&segcenter, i, 0); | |
90 | + masks = get_seg_masks(&segcenter, i, 0, __FILE__, __LINE__); | |
91 | if (masks.centermask == 0) { | |
92 | mprintf((0, "Segment %i center is contained in segment %i\n", segnum, i)); | |
93 | continue; | |
94 | @@ -2234,7 +2234,7 @@ | |
95 | ||
96 | vm_vec_sub(&pdel, &Vertices[Segments[segnum].verts[v]], &segcenter); | |
97 | vm_vec_scale_add(&presult, &segcenter, &pdel, (F1_0*15)/16); | |
98 | - masks = get_seg_masks(&presult, i, 0); | |
99 | + masks = get_seg_masks(&presult, i, 0, __FILE__, __LINE__); | |
100 | if (masks.centermask == 0) { | |
101 | mprintf((0, "Segment %i near vertex %i is contained in segment %i\n", segnum, v, i)); | |
102 | break; | |
103 | --- d1x/editor/func.c.orig Tue Jun 15 00:03:05 1999 | |
104 | +++ d1x/editor/func.c Sun Jun 2 01:39:06 2002 | |
105 | @@ -40,6 +40,7 @@ | |
106 | #include <string.h> | |
107 | ||
108 | #include "func.h" | |
109 | +#include "strutil.h" | |
110 | ||
111 | #define MAX_PARAMS 10 | |
112 | ||
113 | --- d1x/ui/mouse.c.orig Tue Jun 15 00:14:39 1999 | |
114 | +++ d1x/ui/mouse.c Sun Jun 2 01:41:23 2002 | |
115 | @@ -55,7 +55,7 @@ | |
116 | ||
117 | #include <stdlib.h> | |
118 | #ifdef __SDL__ | |
119 | -#include "SDL.h" | |
120 | +#include <SDL/SDL.h> | |
121 | #endif | |
122 | ||
123 | #include "u_mem.h" | |
124 | @@ -168,7 +168,7 @@ | |
125 | { | |
126 | int buttons,w,h; | |
127 | #ifdef __LINUX__ | |
128 | - Uint16 new_x, new_y; | |
129 | + int new_x, new_y; | |
130 | buttons = SDL_GetMouseState(&new_x,&new_y); | |
131 | Mouse.dx = new_x - Mouse.x; | |
132 | Mouse.dy = new_y - Mouse.y; |