projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030104-2-src
[rocksndiamonds.git]
/
src
/
libgame
/
gadgets.c
diff --git
a/src/libgame/gadgets.c
b/src/libgame/gadgets.c
index a099f0b5d7366bb65ce58ebd2d7f9fa209affa65..b5afaa880cc92fc6bae8bee9cabf2b219e521ec7 100644
(file)
--- a/
src/libgame/gadgets.c
+++ b/
src/libgame/gadgets.c
@@
-1,7
+1,7
@@
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-200
1
Artsoft Entertainment *
+* (c) 1994-200
2
Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
@@
-63,6
+63,21
@@
static int getNewGadgetID()
return id;
}
return id;
}
+#if 0
+void DUMP_GADGET_MAP_STATE()
+{
+ struct GadgetInfo *gi = gadget_list_first_entry;
+
+ while (gi)
+ {
+ printf("-XXX-1-> '%s': %s\n",
+ gi->info_text, (gi->mapped ? "mapped" : "not mapped"));
+
+ gi = gi->next;
+ }
+}
+#endif
+
static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my)
{
struct GadgetInfo *gi = gadget_list_first_entry;
static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my)
{
struct GadgetInfo *gi = gadget_list_first_entry;
@@
-82,11
+97,6
@@
static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my)
static void default_callback_info(void *ptr)
{
static void default_callback_info(void *ptr)
{
-#if 0
- if (game_status == LEVELED)
- HandleEditorGadgetInfoText(ptr);
-#endif
-
return;
}
return;
}
@@
-278,8
+288,13
@@
static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
case GDI_INFO_TEXT:
{
int max_textsize = MAX_INFO_TEXTSIZE - 1;
case GDI_INFO_TEXT:
{
int max_textsize = MAX_INFO_TEXTSIZE - 1;
+ char *text = va_arg(ap, char *);
+
+ if (text != NULL)
+ strncpy(gi->info_text, text, max_textsize);
+ else
+ max_textsize = 0;
- strncpy(gi->info_text, va_arg(ap, char *), max_textsize);
gi->info_text[max_textsize] = '\0';
}
break;
gi->info_text[max_textsize] = '\0';
}
break;
@@
-309,7
+324,9
@@
static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
break;
case GDI_CHECKED:
break;
case GDI_CHECKED:
- gi->checked = va_arg(ap, boolean);
+ /* take care here: "boolean" is typedef'ed as "unsigned char",
+ which gets promoted to "int" */
+ gi->checked = (boolean)va_arg(ap, int);
break;
case GDI_RADIO_NR:
break;
case GDI_RADIO_NR:
@@
-559,14
+576,14
@@
void RedrawGadget(struct GadgetInfo *gi)
struct GadgetInfo *CreateGadget(int first_tag, ...)
{
struct GadgetInfo *CreateGadget(int first_tag, ...)
{
- struct GadgetInfo *new_gadget = checked_
m
alloc(sizeof(struct GadgetInfo));
+ struct GadgetInfo *new_gadget = checked_
c
alloc(sizeof(struct GadgetInfo));
va_list ap;
/* always start with reliable default values */
va_list ap;
/* always start with reliable default values */
- memset(new_gadget, 0, sizeof(struct GadgetInfo)); /* zero all fields */
new_gadget->id = getNewGadgetID();
new_gadget->callback_info = default_callback_info;
new_gadget->callback_action = default_callback_action;
new_gadget->id = getNewGadgetID();
new_gadget->callback_info = default_callback_info;
new_gadget->callback_action = default_callback_action;
+ new_gadget->next = NULL;
va_start(ap, first_tag);
HandleGadgetTags(new_gadget, first_tag, ap);
va_start(ap, first_tag);
HandleGadgetTags(new_gadget, first_tag, ap);
@@
-597,7
+614,9
@@
void FreeGadget(struct GadgetInfo *gi)
if (gi == gadget_list_last_entry)
gadget_list_last_entry = gi_previous;
if (gi == gadget_list_last_entry)
gadget_list_last_entry = gi_previous;
- gi_previous->next = gi->next;
+ if (gi_previous)
+ gi_previous->next = gi->next;
+
free(gi);
}
free(gi);
}
@@
-849,15
+868,27
@@
void HandleGadgets(int mx, int my, int button)
if (last_info_gi != new_gi ||
(new_gi && new_gi->type == GD_TYPE_DRAWING_AREA && changed_position))
{
if (last_info_gi != new_gi ||
(new_gi && new_gi->type == GD_TYPE_DRAWING_AREA && changed_position))
{
- last_info_gi = new_gi;
-
if (new_gi != NULL && (button == 0 || new_gi == last_gi))
{
if (new_gi != NULL && (button == 0 || new_gi == last_gi))
{
- new_gi->event.type =
0
;
+ new_gi->event.type =
GD_EVENT_INFO_ENTERING
;
new_gi->callback_info(new_gi);
}
new_gi->callback_info(new_gi);
}
- else
+ else if (last_info_gi != NULL)
+ {
+ last_info_gi->event.type = GD_EVENT_INFO_LEAVING;
+ last_info_gi->callback_info(last_info_gi);
+
+#if 0
default_callback_info(NULL);
default_callback_info(NULL);
+
+ printf("It seems that we are leaving gadget [%s]!\n",
+ (last_info_gi != NULL &&
+ last_info_gi->info_text != NULL ?
+ last_info_gi->info_text : ""));
+#endif
+ }
+
+ last_info_gi = new_gi;
}
if (gadget_pressed)
}
if (gadget_pressed)