Menu
▾
▴
[Exult-cvs-logs] exult/gumps Actor_gump.cc,1.24,1.24.4.1 Gump.cc,1.35,1.35.4.1 Jawbone_gump.cc,1.13,1.13.4.1 Paperdoll_gump.cc,1.50,1.50.2.1
|
From: <js...@us...> - 2004-01-31 07:24:40
|
Update of /cvsroot/exult/exult/gumps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29649/gumps Modified Files: Tag: Multimap Actor_gump.cc Gump.cc Jawbone_gump.cc Paperdoll_gump.cc Log Message: Working on multimap Index: Actor_gump.cc =================================================================== RCS file: /cvsroot/exult/exult/gumps/Actor_gump.cc,v retrieving revision 1.24 retrieving revision 1.24.4.1 diff -u -d -r1.24 -r1.24.4.1 --- Actor_gump.cc 8 Oct 2002 00:32:47 -0000 1.24 +++ Actor_gump.cc 31 Jan 2004 07:22:55 -0000 1.24.4.1 @@ -229,12 +229,13 @@ return; // Not much we can do. int w = shape->get_width(), h = shape->get_height(); // Set object's position. - obj->set_chunk(spotx(index) + shape->get_xleft() - w/2 - object_area.x, + obj->set_shape_pos( + spotx(index) + shape->get_xleft() - w/2 - object_area.x, spoty(index) + shape->get_yabove() - h/2 - object_area.y); // Shift if necessary. - int x0 = obj->get_cx() - shape->get_xleft(), - y0 = obj->get_cy() - shape->get_yabove(); - int newcx = obj->get_cx(), newcy = obj->get_cy(); + int x0 = obj->get_tx() - shape->get_xleft(), + y0 = obj->get_ty() - shape->get_yabove(); + int newcx = obj->get_tx(), newcy = obj->get_ty(); if (x0 < 0) newcx -= x0; if (y0 < 0) @@ -244,7 +245,7 @@ newcx -= x1 - object_area.w; if (y1 > object_area.h) newcy -= y1 - object_area.h; - obj->set_chunk(newcx, newcy); + obj->set_shape_pos(newcx, newcy); } /* @@ -259,7 +260,7 @@ for (size_t i = 0; i < sizeof(coords)/2*sizeof(coords[0]); i++) { // Set object coords. Game_object *obj = container->get_readied(i); - if (obj)//&& !obj->get_cx() && !obj->get_cy()) + if (obj)//&& !obj->get_tx() && !obj->get_ty()) set_to_spot(obj, i); } Index: Gump.cc =================================================================== RCS file: /cvsroot/exult/exult/gumps/Gump.cc,v retrieving revision 1.35 retrieving revision 1.35.4.1 diff -u -d -r1.35 -r1.35.4.1 --- Gump.cc 24 Nov 2002 06:51:25 -0000 1.35 +++ Gump.cc 31 Jan 2004 07:22:55 -0000 1.35.4.1 @@ -111,8 +111,8 @@ Shape_frame *s = obj->get_shape(); if (!s) return Rectangle(0, 0, 0, 0); - return Rectangle(x + object_area.x + obj->get_cx() - s->get_xleft(), - y + object_area.y + obj->get_cy() - s->get_yabove(), + return Rectangle(x + object_area.x + obj->get_tx() - s->get_xleft(), + y + object_area.y + obj->get_ty() - s->get_yabove(), s->get_width(), s->get_height()); } @@ -126,8 +126,8 @@ int& ox, int& oy ) { - ox = x + object_area.x + obj->get_cx(), - oy = y + object_area.y + obj->get_cy(); + ox = x + object_area.x + obj->get_tx(), + oy = y + object_area.y + obj->get_ty(); } /* @@ -245,7 +245,7 @@ // Not a valid spot? if (sx == -1 && sy == -1 && mx == -1 && my == -1) // Let paint() set spot. - obj->set_chunk(255, 255); + obj->set_shape_pos(255, 255); // -2's mean cx, cy are already set. else if (sx != -2 && sy != -2 && mx != -2 && my != -2) { // Put it where desired. @@ -261,7 +261,7 @@ sy = shape->get_yabove(); else if (sy + shape->get_ybelow() > object_area.h) sy = object_area.h - shape->get_ybelow(); - obj->set_chunk(sx, sy); + obj->set_shape_pos(sx, sy); } return (1); } @@ -317,9 +317,9 @@ Shape_frame *shape = obj->get_shape(); if (!shape) continue; - int objx = obj->get_cx() - shape->get_xleft() + + int objx = obj->get_tx() - shape->get_xleft() + 1 + object_area.x; - int objy = obj->get_cy() - shape->get_yabove() + + int objy = obj->get_ty() - shape->get_yabove() + 1 + object_area.y; // Does obj. appear to be placed? if (!object_area.has_point(objx, objy) || @@ -332,7 +332,7 @@ px = endx; if (py > endy) py = endy; - obj->set_chunk(px - shape->get_xright(), + obj->set_shape_pos(px - shape->get_xright(), py - shape->get_ybelow()); // Mostly avoid overlap. curx += shape->get_width() - 1; @@ -344,7 +344,7 @@ cury = 2*(++loop); } } - obj->paint_shape(box.x + obj->get_cx(),box.y + obj->get_cy()); + obj->paint_shape(box.x + obj->get_tx(),box.y + obj->get_ty()); obj = obj->get_next(); } // Outline selections in this gump. Index: Jawbone_gump.cc =================================================================== RCS file: /cvsroot/exult/exult/gumps/Jawbone_gump.cc,v retrieving revision 1.13 retrieving revision 1.13.4.1 diff -u -d -r1.13 -r1.13.4.1 --- Jawbone_gump.cc 26 Jun 2002 23:14:50 -0000 1.13 +++ Jawbone_gump.cc 31 Jan 2004 07:22:55 -0000 1.13.4.1 @@ -139,7 +139,7 @@ int w = shape->get_width(), h = shape->get_height(); // Set object's position. - obj->set_chunk(sx + shape->get_xleft() - w/2, + obj->set_shape_pos(sx + shape->get_xleft() - w/2, sy + shape->get_yabove() - h/2); } Index: Paperdoll_gump.cc =================================================================== RCS file: /cvsroot/exult/exult/gumps/Paperdoll_gump.cc,v retrieving revision 1.50 retrieving revision 1.50.2.1 diff -u -d -r1.50 -r1.50.2.1 --- Paperdoll_gump.cc 19 Jan 2004 19:08:08 -0000 1.50 +++ Paperdoll_gump.cc 31 Jan 2004 07:22:55 -0000 1.50.2.1 @@ -339,7 +339,8 @@ int w = shape->get_width(), h = shape->get_height(); // Set object's position. - obj->set_chunk(spotx(index) + shape->get_xleft() - w/2 - object_area.x, + obj->set_shape_pos( + spotx(index) + shape->get_xleft() - w/2 - object_area.x, spoty(index) + shape->get_yabove() - h/2 - object_area.y); } @@ -539,7 +540,7 @@ if (!item || item->frame == -1 || item->shape == -1) { if ((old_it != -1 && !item)|| checkspot != -1) return; - //if (!obj->get_cx() && !obj->get_cy()) return; + //if (!obj->get_tx() && !obj->get_ty()) return; set_to_spot(obj, spot); @@ -549,7 +550,7 @@ s.paint_shape(box.x + coords_blue[spot*2], box.y + coords_blue[spot*2+1]); - int ox = box.x + obj->get_cx(), oy = box.y + obj->get_cy(); + int ox = box.x + obj->get_tx(), oy = box.y + obj->get_ty(); obj->paint_shape(ox, oy); if (cheat.is_selected(obj)) // Outline selected obj. @@ -936,9 +937,9 @@ { if ((old_it != -1 &&!item) || checkspot != -1) return 0; - if (!obj->get_cx() && !obj->get_cy()) set_to_spot(obj, spot); + if (!obj->get_tx() && !obj->get_ty()) set_to_spot(obj, spot); - if (check_shape (mx - obj->get_cx(), my - obj->get_cy(), + if (check_shape (mx - obj->get_tx(), my - obj->get_ty(), obj->get_shapenum(), obj->get_framenum(), obj->get_shapefile())) { return obj; @@ -975,7 +976,8 @@ Shape_frame *shape = obj->get_shape(); int w = shape->get_width(), h = shape->get_height(); // Set object's position. - obj->set_chunk(mx + shape->get_xleft() - w/2, my + shape->get_yabove() - h/2); + obj->set_shape_pos(mx + shape->get_xleft() - w/2, + my + shape->get_yabove() - h/2); return obj; } |