parent
f3f001fced
commit
eaa53fdb1d
|
@ -78,8 +78,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
static Evas_Object *
|
||||
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Evas_Object *o, *of, *ob, *ol, *oi;
|
||||
E_Radio_Group *rg;
|
||||
Evas_Object *o, *of, *ob, *ol;
|
||||
Population *pop;
|
||||
|
||||
pop = cfd->data;
|
||||
|
@ -151,14 +150,10 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
static void
|
||||
_ilist_cb_selected(void *data)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
char *th;
|
||||
th = data;
|
||||
//cfdata = data;
|
||||
//if (!cfdata) return;
|
||||
|
||||
printf("CB %s\n", th);
|
||||
|
||||
}
|
||||
static int
|
||||
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
|
|
21
e_mod_main.c
21
e_mod_main.c
|
@ -1,8 +1,11 @@
|
|||
#include <e.h>
|
||||
#include <Ecore_Str.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "e_mod_main.h"
|
||||
#include "e_mod_config.h"
|
||||
|
||||
|
||||
#define CLIMBER_PROB 4 // 4 Means: one climber every 5 - 1 Means: all climber - !!Don't set to 0
|
||||
#define FLOATER_PROB 2
|
||||
#define MAX_FALLER_HEIGHT 300
|
||||
|
@ -242,7 +245,7 @@ _population_shutdown(Population *pop)
|
|||
|
||||
while (pop->themes)
|
||||
{
|
||||
printf("Free Theme '%s' :(\n",pop->themes->data);
|
||||
printf("Free Theme '%s' :(\n", (char *)pop->themes->data);
|
||||
pop->themes = evas_list_remove_list(pop->themes, pop->themes);
|
||||
}
|
||||
|
||||
|
@ -274,7 +277,6 @@ _load_action(Population *pop, char *filename, char *name, int id)
|
|||
{
|
||||
Action *act;
|
||||
char *data;
|
||||
int w, h, speed;
|
||||
|
||||
data = edje_file_data_get(filename, name);
|
||||
if (!data)
|
||||
|
@ -301,7 +303,6 @@ _load_custom_action(Population *pop, char *filename, char *name)
|
|||
{
|
||||
Custom_Action *c;
|
||||
char *data;
|
||||
int w, h, speed;
|
||||
char buf[25];
|
||||
|
||||
data = edje_file_data_get(filename, name);
|
||||
|
@ -340,7 +341,6 @@ static void
|
|||
_theme_load(Population *pop)
|
||||
{
|
||||
char *name;
|
||||
Action *act;
|
||||
char buf[15];
|
||||
int i;
|
||||
|
||||
|
@ -399,8 +399,6 @@ _population_load(Population *pop)
|
|||
|
||||
for (i = 0; i < pop->conf->penguins_count; i++)
|
||||
{
|
||||
Evas_Coord tx, ty;
|
||||
|
||||
tux = malloc(sizeof(Penguin));
|
||||
|
||||
o = edje_object_add(pop->canvas);
|
||||
|
@ -443,8 +441,6 @@ _cb_animator(void *data)
|
|||
{
|
||||
Population *pop;
|
||||
Evas_List *l;
|
||||
double d;
|
||||
int ran;
|
||||
|
||||
pop = data;
|
||||
for (l = pop->penguins; l; l = l->next)
|
||||
|
@ -463,10 +459,10 @@ _cb_animator(void *data)
|
|||
else if (tux->action->id == ID_FALLER)
|
||||
{
|
||||
tux->y += ((double)tux->action->speed / 100);
|
||||
if (touch = _is_inside_any_win(pop,
|
||||
if ((touch = _is_inside_any_win(pop,
|
||||
(int)tux->x+(tux->action->w/2),
|
||||
(int)tux->y + tux->action->h,
|
||||
_RET_TOP_VALUE))
|
||||
_RET_TOP_VALUE)))
|
||||
{
|
||||
if (( (int)tux->y - tux->faller_h) > MAX_FALLER_HEIGHT)
|
||||
_start_splatting_at(tux, touch);
|
||||
|
@ -486,11 +482,11 @@ _cb_animator(void *data)
|
|||
else if (tux->action->id == ID_FLOATER)
|
||||
{
|
||||
tux->y += ((double)tux->action->speed / 100);
|
||||
if (touch = _is_inside_any_win(pop,
|
||||
if ((touch = _is_inside_any_win(pop,
|
||||
(int)tux->x+(tux->action->w/2),
|
||||
(int)tux->y + tux->action->h,
|
||||
_RET_TOP_VALUE)
|
||||
)
|
||||
))
|
||||
_start_walking_at(tux, touch);
|
||||
else if (( (int)tux->y + tux->action->h ) > pop->height)
|
||||
_start_walking_at(tux, pop->height);
|
||||
|
@ -799,7 +795,6 @@ static void
|
|||
_start_custom_at(Penguin *tux, int at_y)
|
||||
{
|
||||
int ran;
|
||||
char buf[25];
|
||||
|
||||
if (tux->pop->custom_num < 1)
|
||||
return;
|
||||
|
|
Loading…
Reference in New Issue