made darkplaces compile successfully with g++ to test for errors C doesn't care about...

[xonotic/darkplaces.git] / ui.c

diff --git a/ui.c b/ui.c
index 1e4ed791c8bafaad9d5e733f30d5bf82e6e6122a..bcb46b8a4d9155cbd1bf84bd283ca80066107d5e 100644 (file)
--- a/ui.c
+++ b/ui.c
@@ -136,8 +136,8 @@ void UI_Key(ui_itemlist_t list, int key, int ascii)
 ui_item_t UI_CloneItem(ui_item_t item)
 {
        ui_item_t clone;
 ui_item_t UI_CloneItem(ui_item_t item)
 {
        ui_item_t clone;

-       clone = UI_Alloc(item->size);
-       clone = memcpy(clone, item, item->size);
+       clone = (ui_item_t)UI_Alloc(item->size);
+       memcpy(clone, item, item->size);

 
        return clone;
 }
 
        return clone;
 }


@@ -184,7 +184,7 @@ void UI_FreeItemByName(ui_itemlist_t list, const char *name)
 // itemlist stuff
 ui_itemlist_t UI_CreateItemList(void)
 {
 // itemlist stuff
 ui_itemlist_t UI_CreateItemList(void)
 {

-       return UI_Alloc(sizeof(ui_itemlist_t));
+       return (ui_itemlist_t)UI_Alloc(sizeof(ui_itemlist_t));

 }
 
 ui_itemlist_t UI_CloneItemList(ui_itemlist_t list)
 }
 
 ui_itemlist_t UI_CloneItemList(ui_itemlist_t list)