summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Juyung Seo <juyung.seo@samsung.com>2013-10-10 13:06:01 +0900
committerDaniel Juyung Seo <juyung.seo@samsung.com>2013-10-10 15:04:20 +0900
commit9404a18aa54f5f282f17f2a90dabe0a95371de84 (patch)
treeea07cd8242a6fb13c8292073f2b6e7845626ec0c
parent34180734168079e1cff4030e2ad6fb4acb67f47d (diff)
cell.c, cell_namager.c: Fixed formatting.
-rw-r--r--src/cell.c26
-rw-r--r--src/cell_manager.c32
2 files changed, 29 insertions, 29 deletions
diff --git a/src/cell.c b/src/cell.c
index 6ef61b9..61de84d 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -2,7 +2,7 @@
2 2
3#define TYPE_MAX 8 3#define TYPE_MAX 8
4 4
5static char* style_name ="animal_button"; 5static char* style_name = "animal_button";
6 6
7static void 7static void
8transit_del_cb(void *data, Elm_Transit *transit) 8transit_del_cb(void *data, Elm_Transit *transit)
@@ -23,18 +23,18 @@ cell_down_move(Cell_Info* info, Elm_Transit_Del_Cb move_end_cb)
23{ 23{
24 if (info) 24 if (info)
25 { 25 {
26 Elm_Transit* trans = elm_transit_add(); 26 Elm_Transit* trans = elm_transit_add();
27 elm_transit_object_add(trans, info->obj); 27 elm_transit_object_add(trans, info->obj);
28 elm_transit_effect_translation_add(trans, 0, 0, 28 elm_transit_effect_translation_add(trans, 0, 0,
29 (info->target_x - info->pos_x) *SIZE, 29 (info->target_x - info->pos_x) * SIZE,
30 (info->target_y - info->pos_y) * SIZE); 30 (info->target_y - info->pos_y) * SIZE);
31 elm_transit_duration_set(trans, 0.2); 31 elm_transit_duration_set(trans, 0.2);
32 elm_transit_objects_final_state_keep_set(trans, EINA_TRUE); 32 elm_transit_objects_final_state_keep_set(trans, EINA_TRUE);
33 elm_transit_go(trans); 33 elm_transit_go(trans);
34 34
35 elm_transit_del_cb_set(trans, move_end_cb, info); 35 elm_transit_del_cb_set(trans, move_end_cb, info);
36 evas_object_show(info->obj); 36 evas_object_show(info->obj);
37 } 37 }
38} 38}
39 39
40void 40void
diff --git a/src/cell_manager.c b/src/cell_manager.c
index 111fddb..1cb2c59 100644
--- a/src/cell_manager.c
+++ b/src/cell_manager.c
@@ -153,10 +153,10 @@ _cell_chain_get(Cell_Info* info)
153 Eina_List* total_list = NULL; 153 Eina_List* total_list = NULL;
154 154
155 if (eina_list_count(h_list) >= 2) 155 if (eina_list_count(h_list) >= 2)
156 total_list = eina_list_merge(total_list, h_list); 156 total_list = eina_list_merge(total_list, h_list);
157 157
158 if (eina_list_count(v_list) >= 2) 158 if (eina_list_count(v_list) >= 2)
159 total_list = eina_list_merge(total_list, v_list); 159 total_list = eina_list_merge(total_list, v_list);
160 160
161 return total_list; 161 return total_list;
162} 162}
@@ -173,7 +173,7 @@ _cell_align_get(int x, int y, Eina_List* list)
173{ 173{
174 Cell_Info *info = NULL; 174 Cell_Info *info = NULL;
175 int i; 175 int i;
176 for (i = y ; i >= 0 ; --i) 176 for (i = y; i >= 0; --i)
177 { 177 {
178 info = cell_list[x][i]; 178 info = cell_list[x][i];
179 if (info) 179 if (info)
@@ -198,9 +198,9 @@ _cell_all_check()
198{ 198{
199 int i, j; 199 int i, j;
200 200
201 for ( i = 0 ; i < CELL_WIDTH ; i++) 201 for (i = 0; i < CELL_WIDTH; i++)
202 { 202 {
203 for ( j = CELL_HEIGHT -1 ; j >= 0 ; --j) 203 for (j = CELL_HEIGHT -1; j >= 0; --j)
204 { 204 {
205 if(!cell_list[i][j]->triple_match) 205 if(!cell_list[i][j]->triple_match)
206 { 206 {
@@ -239,7 +239,7 @@ static void
239_cell_line_down(int x, Eina_List* list) 239_cell_line_down(int x, Eina_List* list)
240{ 240{
241 int y = CELL_HEIGHT - 1; 241 int y = CELL_HEIGHT - 1;
242 for ( ; y >= 0 ; --y) 242 for (; y >= 0; --y)
243 { 243 {
244 if (cell_list[x][y] == NULL) 244 if (cell_list[x][y] == NULL)
245 { 245 {
@@ -270,7 +270,7 @@ _cell_chain_explosion(Eina_List* list)
270 } 270 }
271 271
272 int i = 0 ; 272 int i = 0 ;
273 for ( ; i < CELL_WIDTH ; i++) 273 for (; i < CELL_WIDTH; i++)
274 _cell_line_down(i,list); 274 _cell_line_down(i,list);
275} 275}
276 276
@@ -290,7 +290,7 @@ _cell_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
290static void 290static void
291_cell_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) 291_cell_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
292{ 292{
293 if(!selected_cell) return; 293 if (!selected_cell) return;
294 294
295 Evas_Event_Mouse_Move *ev = event_info; 295 Evas_Event_Mouse_Move *ev = event_info;
296 if (ev->buttons != 1) return; 296 if (ev->buttons != 1) return;
@@ -339,17 +339,17 @@ cell_table_shuffle(void)
339 Cell_Info *cell_info; 339 Cell_Info *cell_info;
340 int i = 0, j = 0; 340 int i = 0, j = 0;
341 341
342 for (j = 0 ; j < CELL_HEIGHT ; ++j) 342 for (j = 0 ; j < CELL_HEIGHT; ++j)
343 { 343 {
344 for (i = 0 ; i < CELL_WIDTH ; ++i) 344 for (i = 0; i < CELL_WIDTH; ++i)
345 { 345 {
346 cell_info = cell_list[i][j]; 346 cell_info = cell_list[i][j];
347 cell_type_reset(cell_info); 347 cell_type_reset(cell_info);
348 } 348 }
349 } 349 }
350 for (j = 0 ; j < CELL_HEIGHT ; ++j) 350 for (j = 0; j < CELL_HEIGHT; ++j)
351 { 351 {
352 for (i = 0 ; i < CELL_WIDTH ; ++i) 352 for (i = 0; i < CELL_WIDTH; ++i)
353 { 353 {
354 cell_info = cell_list[i][j]; 354 cell_info = cell_list[i][j];
355 while (_cell_chain_get(cell_info)) 355 while (_cell_chain_get(cell_info))
@@ -364,9 +364,9 @@ cell_table_init(Evas_Object *parent)
364 Cell_Info *cell_info; 364 Cell_Info *cell_info;
365 int i = 0, j = 0; 365 int i = 0, j = 0;
366 366
367 for (j = 0 ; j < CELL_HEIGHT ; ++j) 367 for (j = 0; j < CELL_HEIGHT; ++j)
368 { 368 {
369 for (i = 0 ; i < CELL_WIDTH ; ++i) 369 for (i = 0; i < CELL_WIDTH; ++i)
370 { 370 {
371 cell_info = cell_add(parent, i, j); 371 cell_info = cell_add(parent, i, j);
372 while (_cell_chain_get(cell_info)) 372 while (_cell_chain_get(cell_info))
@@ -390,9 +390,9 @@ cell_table_remove(void)
390{ 390{
391 int i, j; 391 int i, j;
392 392
393 for (j = 0 ; j < CELL_HEIGHT ; ++j) 393 for (j = 0; j < CELL_HEIGHT; ++j)
394 { 394 {
395 for (i = 0 ; i < CELL_WIDTH ; ++i) 395 for (i = 0; i < CELL_WIDTH; ++i)
396 { 396 {
397 cell_remove(cell_list[i][j]); 397 cell_remove(cell_list[i][j]);
398 } 398 }