qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix a bunch of gcc-4.1 warnings (thanks for the heads up, jordi)

Browse source
This commit is contained in:
Bill Currie 2006-11-30 22:52:36 +00:00 committed by Jeff Teunissen
parent 538f0ee51f
commit d28952dfcc
4 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/QF/progs.h
View file

@ -1139,6 +1139,8 @@ typedef struct {
strref_t *tstr;
} prstack_t;
struct obj_list_s;
struct progs_s {
edict_t **edicts;
int *num_edicts;
@ -1237,16 +1239,16 @@ struct progs_s {
//@{
int selector_index;
int selector_index_max;
void *selector_sels;
struct obj_list_s **selector_sels;
string_t *selector_names;
struct hashtab_s *selector_hash;
struct hashtab_s *classes;
struct hashtab_s *load_methods;
void *unresolved_classes;
void *unclaimed_categories;
void *unclaimed_proto_list;
void *module_list;
void *class_tree_list;
struct obj_list_s *unresolved_classes;
struct obj_list_s *unclaimed_categories;
struct obj_list_s *unclaimed_proto_list;
struct obj_list_s *module_list;
struct obj_list_s *class_tree_list;
//@}
/// debug info

8
libs/net/nm/net_vcr.c
View file

@ -99,7 +99,7 @@ VCR_GetMessage (qsocket_t * sock)
int ret;
if (host_time != next.time || next.op != VCR_OP_GETMESSAGE
|| next.session != *(long *) (&sock->driverdata))
|| next.session != *(long *) (char *) (&sock->driverdata))
Sys_Error ("VCR missmatch");
Qread (vcrFile, &ret, sizeof (int));
@ -126,7 +126,7 @@ VCR_SendMessage (qsocket_t * sock, sizebuf_t *data)
int ret;
if (host_time != next.time || next.op != VCR_OP_SENDMESSAGE
|| next.session != *(long *) (&sock->driverdata))
|| next.session != *(long *) (char *) (&sock->driverdata))
Sys_Error ("VCR missmatch");
Qread (vcrFile, &ret, sizeof (int));
@ -143,7 +143,7 @@ VCR_CanSendMessage (qsocket_t * sock)
qboolean ret;
if (host_time != next.time || next.op != VCR_OP_CANSENDMESSAGE
|| next.session != *(long *) (&sock->driverdata))
|| next.session != *(long *) (char *) (&sock->driverdata))
Sys_Error ("VCR missmatch");
Qread (vcrFile, &ret, sizeof (int));
@ -187,7 +187,7 @@ VCR_CheckNewConnections (void)
}
sock = NET_NewQSocket ();
*(long *) (&sock->driverdata) = next.session;
*(long *) (char *) (&sock->driverdata) = next.session;
Qread (vcrFile, sock->address, NET_NAMELEN);
VCR_ReadNext ();

35
libs/ruamoko/rua_obj.c
View file

@ -51,8 +51,8 @@ static __attribute__ ((used)) const char rcsid[] =
#include "compat.h"
#include "rua_internal.h"
typedef struct obj_list {
struct obj_list *next;
typedef struct obj_list_s {
struct obj_list_s *next;
void *data;
} obj_list;
@ -391,7 +391,7 @@ add_sel_name (progs_t *pr, const char *name)
pr->selector_names = realloc (pr->selector_names,
size * sizeof (string_t));
for (i = pr->selector_index_max; i < size; i++) {
((obj_list **) pr->selector_sels)[i] = 0;
pr->selector_sels[i] = 0;
pr->selector_names[i] = 0;
}
pr->selector_index_max = size;
@ -410,7 +410,7 @@ sel_register_typed_name (progs_t *pr, const char *name, const char *types,
index = (long) Hash_Find (pr->selector_hash, name);
if (index) {
for (l = ((obj_list **) pr->selector_sels)[index]; l; l = l->next) {
for (l = pr->selector_sels[index]; l; l = l->next) {
pr_sel_t *s = l->data;
if (!types || !s->sel_types) {
if (!s->sel_types && !types) {
@ -440,8 +440,8 @@ sel_register_typed_name (progs_t *pr, const char *name, const char *types,
l = obj_list_new ();
l->data = sel;
l->next = ((obj_list **) pr->selector_sels)[index];
((obj_list **) pr->selector_sels)[index] = l;
l->next = pr->selector_sels[index];
pr->selector_sels[index] = l;
if (is_new)
Hash_Add (pr->selector_hash, (void *) index);
@ -608,12 +608,12 @@ obj_send_load (progs_t *pr)
obj_list *m;
if (pr->unresolved_classes) {
pr_class_t *class = ((obj_list *) pr->unresolved_classes)->data;
pr_class_t *class = pr->unresolved_classes->data;
const char *super_class = PR_GetString (pr, class->super_class);
while (Hash_Find (pr->classes, super_class)) {
list_remove ((obj_list **) &pr->unresolved_classes);
list_remove (&pr->unresolved_classes);
if (pr->unresolved_classes) {
class = ((obj_list *) pr->unresolved_classes)->data;
class = pr->unresolved_classes->data;
super_class = PR_GetString (pr, class->super_class);
} else {
break;
@ -628,11 +628,10 @@ obj_send_load (progs_t *pr)
for (m = pr->module_list; m; m = m->next)
obj_create_classes_tree (pr, m->data);
while (pr->class_tree_list) {
obj_preorder_traverse (pr, ((obj_list *) pr->class_tree_list)->data,
0, send_load);
obj_postorder_traverse (pr, ((obj_list *) pr->class_tree_list)->data,
0, obj_destroy_class_tree_node);
list_remove ((obj_list **) &pr->class_tree_list);
obj_preorder_traverse (pr, pr->class_tree_list->data, 0, send_load);
obj_postorder_traverse (pr, pr->class_tree_list->data, 0,
obj_destroy_class_tree_node);
list_remove (&pr->class_tree_list);
}
//XXX callback
//for (m = pr->module_list; m; m = m->next)
@ -821,7 +820,7 @@ rua___obj_exec_class (progs_t *pr)
}
}
for (cell = (obj_list **) &pr->unclaimed_categories; *cell; ) {
for (cell = &pr->unclaimed_categories; *cell; ) {
pr_category_t *category = (*cell)->data;
const char *class_name = PR_GetString (pr, category->class_name);
pr_class_t *class = Hash_Find (pr->classes, class_name);
@ -835,7 +834,7 @@ rua___obj_exec_class (progs_t *pr)
}
if (pr->unclaimed_proto_list && Hash_Find (pr->classes, "Protocol")) {
for (cell = (obj_list **) &pr->unclaimed_proto_list; *cell; ) {
for (cell = &pr->unclaimed_proto_list; *cell; ) {
obj_init_protocols (pr, (*cell)->data);
list_remove (cell);
}
@ -1518,8 +1517,8 @@ rua_init_runtime (progs_t *pr)
Hash_FlushTable (pr->selector_hash);
pr->selector_index = 0;
for (i = 0; i < pr->selector_index_max; i++) {
obj_list_free (((obj_list **) pr->selector_sels)[i]);
((obj_list **) pr->selector_sels)[i] = 0;
obj_list_free (pr->selector_sels[i]);
pr->selector_sels[i] = 0;
pr->selector_names[i] = 0;
}

2
tools/wad/grab.c
View file

@ -459,7 +459,7 @@ GrabMip (script_t *script)
r = *screen_p++;
g = *screen_p++;
b = *screen_p++;
*screen_p++; // skip over alpha
screen_p++; // skip over alpha
*lump_p++ = BestColor (r, g, b, 0, 239);
}
screen_p += linedelta;