Remove redundant ampersand breaking ContainerOf and List_For_Each_Entry. Make all...

diff --git a/cmd.c b/cmd.c
index 8fef16f446aa45c44d7d7c4272617a5b44d43a4d..abc512eef3a4e547ba72e24e07e1aaad43cbe961 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -86,12 +86,8 @@ static void Cmd_Defer_f (cmd_state_t *cmd)
                        Con_Printf("No commands are pending.\n");
                else
                {
                        Con_Printf("No commands are pending.\n");
                else
                {

-                       llist_t *pos;
-               List_For_Each(pos, &cbuf->deferred)
-               {
-                               current = List_Entry(*pos, cmd_input_t, list);
+                       List_For_Each_Entry(current, &cbuf->deferred, list)

                                Con_Printf("-> In %9.2f: %s\n", current->delay, current->text);
                                Con_Printf("-> In %9.2f: %s\n", current->delay, current->text);

-                       }

                }
        }
        else if(Cmd_Argc(cmd) == 2 && !strcasecmp("clear", Cmd_Argv(cmd, 1)))
                }
        }
        else if(Cmd_Argc(cmd) == 2 && !strcasecmp("clear", Cmd_Argv(cmd, 1)))


@@ -183,7 +179,7 @@ static cmd_input_t *Cbuf_LinkGet(cmd_buf_t *cbuf, cmd_input_t *existing)
                ret = existing;
        else if(!List_Is_Empty(&cbuf->free))
        {
                ret = existing;
        else if(!List_Is_Empty(&cbuf->free))
        {

-               ret = List_Entry(*cbuf->free.next, cmd_input_t, list);
+               ret = List_Entry(cbuf->free.next, cmd_input_t, list);

                ret->length = 0;
                ret->pending = false;
        }
                ret->length = 0;
                ret->pending = false;
        }


@@ -370,7 +366,7 @@ void Cbuf_AddText (cmd_state_t *cmd, const char *text)
                Con_Print("Cbuf_AddText: overflow\n");
        else
        {
                Con_Print("Cbuf_AddText: overflow\n");
        else
        {

-               Cbuf_LinkCreate(cmd, &llist, (List_Is_Empty(&cbuf->start) ? NULL : List_Entry(*cbuf->start.prev, cmd_input_t, list)), text);
+               Cbuf_LinkCreate(cmd, &llist, (List_Is_Empty(&cbuf->start) ? NULL : List_Entry(cbuf->start.prev, cmd_input_t, list)), text);

                if(!List_Is_Empty(&llist))
                        List_Splice_Tail(&llist, &cbuf->start);
        }
                if(!List_Is_Empty(&llist))
                        List_Splice_Tail(&llist, &cbuf->start);
        }


@@ -398,7 +394,7 @@ void Cbuf_InsertText (cmd_state_t *cmd, const char *text)
                Con_Print("Cbuf_InsertText: overflow\n");
        else
        {
                Con_Print("Cbuf_InsertText: overflow\n");
        else
        {

-               Cbuf_LinkCreate(cmd, &llist, List_Entry(*cbuf->start.next, cmd_input_t, list), text);
+               Cbuf_LinkCreate(cmd, &llist, List_Entry(cbuf->start.next, cmd_input_t, list), text);

                if(!List_Is_Empty(&llist))
                        List_Splice(&llist, &cbuf->start);
        }
                if(!List_Is_Empty(&llist))
                        List_Splice(&llist, &cbuf->start);
        }


@@ -413,7 +409,6 @@ Cbuf_Execute_Deferred --blub
 */
 static void Cbuf_Execute_Deferred (cmd_buf_t *cbuf)
 {
 */
 static void Cbuf_Execute_Deferred (cmd_buf_t *cbuf)
 {

-       llist_t *pos;

        cmd_input_t *current;
        double eat;
 
        cmd_input_t *current;
        double eat;
 


@@ -424,14 +419,13 @@ static void Cbuf_Execute_Deferred (cmd_buf_t *cbuf)
                return;
        cbuf->deferred_oldtime = host.realtime;
 
                return;
        cbuf->deferred_oldtime = host.realtime;
 

-    List_For_Each(pos, &cbuf->deferred)
+       List_For_Each_Entry(current, &cbuf->deferred, list)

        {
        {

-               current = List_Entry(*pos, cmd_input_t, list);

                current->delay -= eat;
                if(current->delay <= 0)
                {
                        cbuf->size += current->length;
                current->delay -= eat;
                if(current->delay <= 0)
                {
                        cbuf->size += current->length;

-                       List_Move(pos, &cbuf->start);
+                       List_Move(&current->list, &cbuf->start);

                        // We must return and come back next frame or the engine will freeze. Fragile... like glass :3
                        return;
                }
                        // We must return and come back next frame or the engine will freeze. Fragile... like glass :3
                        return;
                }


@@ -460,7 +454,7 @@ void Cbuf_Execute (cmd_buf_t *cbuf)
                 * commands down. This is necessary because commands (exec, alias)
                 * can insert data at the beginning of the text buffer
                 */
                 * commands down. This is necessary because commands (exec, alias)
                 * can insert data at the beginning of the text buffer
                 */

-               current = List_Entry(*cbuf->start.next, cmd_input_t, list);
+               current = List_Entry(cbuf->start.next, cmd_input_t, list);

                
                // Recycle memory so using WASD doesn't cause a malloc and free
                List_Move_Tail(&current->list, &cbuf->free);
                
                // Recycle memory so using WASD doesn't cause a malloc and free
                List_Move_Tail(&current->list, &cbuf->free);

diff --git a/common.h b/common.h
index 4f5e88b36f5d0583ad5bbfdd975d06fa2446e180..5338d514ef60bc7ab5116d70b27dc592e223d15b 100644 (file)
--- a/common.h
+++ b/common.h
@@ -42,7 +42,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 //============================================================================
 
 
 //============================================================================
 

-#define ContainerOf(ptr, type, member) ((type *)((char *)&(ptr) - offsetof(type, member)))
+#define ContainerOf(ptr, type, member) ((type *)((char *)(ptr) - offsetof(type, member)))

 
 typedef struct sizebuf_s
 {
 
 typedef struct sizebuf_s
 {

diff --git a/world.c b/world.c
index 26ffd9bbe57d4fd5365eb1b279364fc72b8a583f..5f703a5d8522f413236ba1535b56ea4abfb04e11 100644 (file)
--- a/world.c
+++ b/world.c
@@ -148,10 +148,10 @@ void World_UnlinkAll(world_t *world)
        // unlink all entities one by one
        grid = &world->areagrid_outside;
        while (grid->list.next != &grid->list)
        // unlink all entities one by one
        grid = &world->areagrid_outside;
        while (grid->list.next != &grid->list)

-               World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(*grid->list.next, link_t, list)->entitynumber));
+               World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(grid->list.next, link_t, list)->entitynumber));

        for (i = 0, grid = world->areagrid;i < AREA_GRIDNODES;i++, grid++)
                while (grid->list.next != &grid->list)
        for (i = 0, grid = world->areagrid;i < AREA_GRIDNODES;i++, grid++)
                while (grid->list.next != &grid->list)

-                       World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(*grid->list.next, link_t, list)->entitynumber));
+                       World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(grid->list.next, link_t, list)->entitynumber));

 }
 
 /*
 }
 
 /*


@@ -173,7 +173,6 @@ int World_EntitiesInBox(world_t *world, const vec3_t requestmins, const vec3_t r
 {
        prvm_prog_t *prog = world->prog;
        int numlist;
 {
        prvm_prog_t *prog = world->prog;
        int numlist;

-       llist_t *pos;

        link_t *grid;
        link_t *l;
        prvm_edict_t *ent;
        link_t *grid;
        link_t *l;
        prvm_edict_t *ent;


@@ -216,9 +215,8 @@ int World_EntitiesInBox(world_t *world, const vec3_t requestmins, const vec3_t r
        if (world->areagrid_outside.list.next)
        {
                grid = &world->areagrid_outside;
        if (world->areagrid_outside.list.next)
        {
                grid = &world->areagrid_outside;

-               List_For_Each(pos, &grid->list)
+               List_For_Each_Entry(l, &grid->list, list)

                {
                {

-                       l = List_Entry(*pos, link_t, list);

                        ent = PRVM_EDICT_NUM(l->entitynumber);
                        if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber)
                        {
                        ent = PRVM_EDICT_NUM(l->entitynumber);
                        if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber)
                        {


@@ -241,9 +239,8 @@ int World_EntitiesInBox(world_t *world, const vec3_t requestmins, const vec3_t r
                {
                        if (grid->list.next)
                        {
                {
                        if (grid->list.next)
                        {

-                               List_For_Each(pos, &grid->list)
+                               List_For_Each_Entry(l, &grid->list, list)

                                {
                                {

-                                       l = List_Entry(*pos, link_t, list);

                                        ent = PRVM_EDICT_NUM(l->entitynumber);
                                        if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber)
                                        {
                                        ent = PRVM_EDICT_NUM(l->entitynumber);
                                        if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber)
                                        {