ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
Revision 1.63 - (view) (download) (annotate) - [select for diffs]
Mon Mar 5 15:36:29 2007 UTC (17 years, 3 months ago) by root
Branch: MAIN
CVS Tags: rel-2_0
Changes since 1.62: +32 -40 lines
Diff to previous 1.62 , to selected 1.37
i just had to rewrite it

Revision 1.62 - (view) (download) (annotate) - [select for diffs]
Mon Feb 19 19:10:31 2007 UTC (17 years, 3 months ago) by root
Branch: MAIN
Changes since 1.61: +1 -0 lines
Diff to previous 1.61 , to selected 1.37
fix crash with patch and create

Revision 1.61 - (view) (download) (annotate) - [select for diffs]
Sat Feb 17 01:58:54 2007 UTC (17 years, 4 months ago) by root
Branch: MAIN
Changes since 1.60: +7 -0 lines
Diff to previous 1.60 , to selected 1.37
*** empty log message ***

Revision 1.60 - (view) (download) (annotate) - [select for diffs]
Fri Feb 16 22:21:45 2007 UTC (17 years, 4 months ago) by root
Branch: MAIN
Changes since 1.59: +2 -1 lines
Diff to previous 1.59 , to selected 1.37
- set map before parsing an object, add_button_link requires this
  completely bogus idiotic design bug.
- document speed hack by elmex :)

Revision 1.59 - (view) (download) (annotate) - [select for diffs]
Fri Feb 16 19:43:40 2007 UTC (17 years, 4 months ago) by root
Branch: MAIN
Changes since 1.58: +361 -432 lines
Diff to previous 1.58 , to selected 1.37
- identified random memory corrutpion bug
- fixed most likely cause for bug above
- rewrote object loader etc. into a simple one-line lookahead
  parser.
- rewrote/cleaned up archetype, treasure, artifact, formula parser.
- some optimisations / cleanups

Revision 1.58 - (view) (download) (annotate) - [select for diffs]
Thu Feb 15 21:07:48 2007 UTC (17 years, 4 months ago) by root
Branch: MAIN
Changes since 1.57: +33 -164 lines
Diff to previous 1.57 , to selected 1.37
- use a simpler, less fancy loader base design (basically a one-line-lookahead
  top-down parser).

Revision 1.57 - (view) (download) (annotate) - [select for diffs]
Sat Feb 10 01:52:25 2007 UTC (17 years, 4 months ago) by root
Branch: MAIN
Changes since 1.56: +21 -32 lines
Diff to previous 1.56 , to selected 1.37
hell on earth, rewrote the container code
- it really was a mess before
- open/close events should now be very reliable.
- make container an object_ptr, just to be on the safe side
  (the old code is known to crash, the new code should be reliable, but...).
- its also smaller, much smaller/clearer in sourcecode size and a bit
  smaller in text segment size.

also disable big worldmap again: is this still causing memleaks?

Revision 1.56 - (view) (download) (annotate) - [select for diffs]
Fri Feb 9 01:52:10 2007 UTC (17 years, 4 months ago) by root
Branch: MAIN
Changes since 1.55: +5 -8 lines
Diff to previous 1.55 , to selected 1.37
minor stuff, indent

Revision 1.55 - (view) (download) (annotate) - [select for diffs]
Thu Feb 8 03:09:31 2007 UTC (17 years, 4 months ago) by root
Branch: MAIN
Changes since 1.54: +2 -0 lines
Diff to previous 1.54 , to selected 1.37
Object => object

Revision 1.54 - (view) (download) (annotate) - [select for diffs]
Wed Feb 7 02:04:46 2007 UTC (17 years, 4 months ago) by root
Branch: MAIN
Changes since 1.53: +2 -2 lines
Diff to previous 1.53 , to selected 1.37
rework material code in preparation for nuking object->materials, also add some useful object methods in preparation of the mapspace limiting

Revision 1.53 - (view) (download) (annotate) - [select for diffs]
Thu Feb 1 19:40:42 2007 UTC (17 years, 4 months ago) by root
Branch: MAIN
Changes since 1.52: +4 -0 lines
Diff to previous 1.52 , to selected 1.37
load regions from perl, reload on, well, reload

Revision 1.52 - (view) (download) (annotate) - [select for diffs]
Thu Feb 1 19:15:38 2007 UTC (17 years, 4 months ago) by root
Branch: MAIN
Changes since 1.51: +65 -96 lines
Diff to previous 1.51 , to selected 1.37
- improve error messages from object_thawer to incldue line numbers
- provide geenric parse error handler
- finish basic design of generic object loader
- implement generic regions loader
- use it to load regions:
  loader_region loader;
  if (!loader.load (filename))
    error;
- regions should now be the very first filetype that could be reloaded at runtime

Revision 1.51 - (view) (download) (annotate) - [select for diffs]
Thu Feb 1 17:29:16 2007 UTC (17 years, 4 months ago) by root
Branch: MAIN
Changes since 1.50: +41 -8 lines
Diff to previous 1.50 , to selected 1.37
goofing around

Revision 1.50 - (view) (download) (annotate) - [select for diffs]
Fri Jan 19 18:06:51 2007 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.49: +120 -9 lines
Diff to previous 1.49 , to selected 1.37
base classes can be so tedious

Revision 1.49 - (view) (download) (annotate) - [select for diffs]
Fri Jan 19 17:54:15 2007 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.48: +4 -1 lines
Diff to previous 1.48 , to selected 1.37
do what should have been done long ago

Revision 1.48 - (view) (download) (annotate) - [select for diffs]
Fri Jan 19 17:50:10 2007 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.47: +43 -0 lines
Diff to previous 1.47 , to selected 1.37
- rename Animations => animation
- rename New_Face => facetile
- add but do not implement some generic loader framework classes

Revision 1.47 - (view) (download) (annotate) - [select for diffs]
Thu Jan 18 19:42:09 2007 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.46: +1 -1 lines
Diff to previous 1.46 , to selected 1.37
just experimenting

Revision 1.46 - (view) (download) (annotate) - [select for diffs]
Mon Jan 15 21:06:18 2007 UTC (17 years, 5 months ago) by pippijn
Branch: MAIN
Changes since 1.45: +22 -22 lines
Diff to previous 1.45 , to selected 1.37
comments

Revision 1.45 - (view) (download) (annotate) - [select for diffs]
Sun Jan 14 23:15:57 2007 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.44: +2 -5 lines
Diff to previous 1.44 , to selected 1.37
fix 'object lacks animation' continued reporting. maps should use 'animation', not 'animation NONE'

Revision 1.44 - (view) (download) (annotate) - [select for diffs]
Thu Jan 11 01:10:01 2007 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.43: +2 -1 lines
Diff to previous 1.43 , to selected 1.37
implement new flag_no_save to avoid saving

Revision 1.43 - (view) (download) (annotate) - [select for diffs]
Mon Jan 8 12:44:34 2007 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.42: +2 -1 lines
Diff to previous 1.42 , to selected 1.37
save obj_original flag

Revision 1.42 - (view) (download) (annotate) - [select for diffs]
Mon Jan 8 01:19:02 2007 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.41: +4 -4 lines
Diff to previous 1.41 , to selected 1.37
more preperations for player eviction

Revision 1.41 - (view) (download) (annotate) - [select for diffs]
Sun Jan 7 23:10:42 2007 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.40: +2 -0 lines
Diff to previous 1.40 , to selected 1.37
- more improvements/fixes
- timestamp with millisecond accuracy, horrible code

Revision 1.40 - (view) (download) (annotate) - [select for diffs]
Sat Jan 6 14:42:29 2007 UTC (17 years, 5 months ago) by pippijn
Branch: MAIN
Changes since 1.39: +1 -0 lines
Diff to previous 1.39 , to selected 1.37
added some copyrights

Revision 1.39 - (view) (download) (annotate) - [select for diffs]
Wed Jan 3 02:51:09 2007 UTC (17 years, 5 months ago) by elmex
Branch: MAIN
Changes since 1.38: +2 -4 lines
Diff to previous 1.38 , to selected 1.37
removed last references to 'editor' variable.

Revision 1.38 - (view) (download) (annotate) - [select for diffs]
Wed Jan 3 00:21:35 2007 UTC (17 years, 5 months ago) by pippijn
Branch: MAIN
Changes since 1.37: +2 -2 lines
Diff to previous 1.37
initialised :)

Revision 1.37 - (view) (download) (annotate) - [selected]
Tue Jan 2 23:39:21 2007 UTC (17 years, 5 months ago) by pippijn
Branch: MAIN
Changes since 1.36: +2 -2 lines
Diff to previous 1.36
started a fix of the log

Revision 1.36 - (view) (download) (annotate) - [select for diffs]
Mon Jan 1 21:19:51 2007 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.35: +1 -5 lines
Diff to previous 1.35 , to selected 1.37
minor changes, follow command still borked

Revision 1.35 - (view) (download) (annotate) - [select for diffs]
Mon Jan 1 00:41:02 2007 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.34: +4 -10 lines
Diff to previous 1.34 , to selected 1.37
use freezer api for saving players, too

Revision 1.34 - (view) (download) (annotate) - [select for diffs]
Sun Dec 31 18:10:40 2006 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.33: +0 -1 lines
Diff to previous 1.33 , to selected 1.37
- style maps need very special treatment
- cf has a nonzero chance of crashing in a random map

Revision 1.33 - (view) (download) (annotate) - [select for diffs]
Sun Dec 31 17:17:22 2006 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.32: +9 -4 lines
Diff to previous 1.32 , to selected 1.37
many minor changes everywhere, random maps crash sometimes but design is in place

Revision 1.32 - (view) (download) (annotate) - [select for diffs]
Sat Dec 30 21:07:46 2006 UTC (17 years, 5 months ago) by elmex
Branch: MAIN
Changes since 1.31: +5 -0 lines
Diff to previous 1.31 , to selected 1.37
fixed the problem where objects with speed=0 were on the active object list.
extended debug_desc a bit. implemented object::has_active_speed ().

Revision 1.31 - (view) (download) (annotate) - [select for diffs]
Sat Dec 30 10:16:10 2006 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.30: +37 -41 lines
Diff to previous 1.30 , to selected 1.37
preliminary snapshot check-in, DO NOT USE IN PRODUCTION SYSTEMS
See the Changes file for details

Revision 1.30 - (view) (download) (annotate) - [select for diffs]
Tue Dec 26 08:54:59 2006 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.29: +7 -8 lines
Diff to previous 1.29 , to selected 1.37
replace update_ob_speed by ->set_speed

Revision 1.29 - (view) (download) (annotate) - [select for diffs]
Mon Dec 25 17:11:16 2006 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.28: +5 -36 lines
Diff to previous 1.28 , to selected 1.37
- some fixes
- disable some refcounting again, not ready yet
- simplify save_object

Revision 1.28 - (view) (download) (annotate) - [select for diffs]
Mon Dec 25 11:25:49 2006 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.27: +3 -5 lines
Diff to previous 1.27 , to selected 1.37
- small, but subtle, rewrite of object management
- perl will now keep attachable objects alive
- objects are now refcounted
- refcouts need to be tested explicitly (refcnt_chk)
- explicit destroy is required current
- explicit destroy asks "nicely" for the object to self destruct, if possible
- refcounts will be used during mortal killing
- minor bugfixes, optimisations etc.
- some former hacks removed.

Revision 1.27 - (view) (download) (annotate) - [select for diffs]
Sat Dec 23 06:41:39 2006 UTC (17 years, 5 months ago) by root
Branch: MAIN
Changes since 1.26: +3 -3 lines
Diff to previous 1.26 , to selected 1.37
- rename flags => flag (because its rpedominantly used singular),
- remove remaining use of the flags array semantics

Revision 1.26 - (view) (download) (annotate) - [select for diffs]
Mon Dec 18 17:10:07 2006 UTC (17 years, 6 months ago) by elmex
Branch: MAIN
Changes since 1.25: +1 -2 lines
Diff to previous 1.25 , to selected 1.37
removed FLAG_TREASURE as it is not used by the code and not by the archetypes
or in maps.

Revision 1.25 - (view) (download) (annotate) - [select for diffs]
Mon Dec 18 03:00:02 2006 UTC (17 years, 6 months ago) by root
Branch: MAIN
Changes since 1.24: +1 -1 lines
Diff to previous 1.24 , to selected 1.37
ooification

Revision 1.24 - (view) (download) (annotate) - [select for diffs]
Mon Dec 18 02:35:00 2006 UTC (17 years, 6 months ago) by root
Branch: MAIN
Changes since 1.23: +1 -1 lines
Diff to previous 1.23 , to selected 1.37
- remove recycle_tmp_maps setting (hardwired to true)
- replace object->flags by std::bitset, seems to be way
  more efficient, for some unexplainable and not looked-into reason.
  its way cleaner, too...

Revision 1.23 - (view) (download) (annotate) - [select for diffs]
Fri Dec 15 19:59:19 2006 UTC (17 years, 6 months ago) by root
Branch: MAIN
Changes since 1.22: +0 -1 lines
Diff to previous 1.22 , to selected 1.37
the rename for sanity campaign hits
you died
- renamed stuff
- partially updated copyrights
- some cleanups

Revision 1.22 - (view) (download) (annotate) - [select for diffs]
Tue Dec 12 21:39:56 2006 UTC (17 years, 6 months ago) by root
Branch: MAIN
Changes since 1.21: +6 -9 lines
Diff to previous 1.21 , to selected 1.37
- more ooficiation
- removed now superfluous remove calls

Revision 1.21 - (view) (download) (annotate) - [select for diffs]
Tue Dec 12 20:53:02 2006 UTC (17 years, 6 months ago) by root
Branch: MAIN
Changes since 1.20: +3 -3 lines
Diff to previous 1.20 , to selected 1.37
replace some function- by method-calls

Revision 1.20 - (view) (download) (annotate) - [select for diffs]
Tue Nov 7 14:58:35 2006 UTC (17 years, 7 months ago) by root
Branch: MAIN
Changes since 1.19: +2 -12 lines
Diff to previous 1.19 , to selected 1.37
- likely fix patch/create variable setters
- abstract away access rights with $ob->may ("xxx") and use it

Revision 1.19 - (view) (download) (annotate) - [select for diffs]
Thu Sep 21 00:05:24 2006 UTC (17 years, 8 months ago) by root
Branch: MAIN
Changes since 1.18: +138 -48 lines
Diff to previous 1.18 , to selected 1.37
further simplify and speed up map saving, fixed
- flag_player_sold was incorrectly saved as "player sold 1"
- flag_has_ready_range was not saved
- flag_is_dust is not in use anymore

not well tested

Revision 1.18 - (view) (download) (annotate) - [select for diffs]
Fri Sep 15 00:31:36 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Changes since 1.17: +209 -614 lines
Diff to previous 1.17 , to selected 1.37
reindent

Revision 1.17 - (view) (download) (annotate) - [select for diffs]
Thu Sep 14 22:33:59 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Changes since 1.16: +2 -3 lines
Diff to previous 1.16 , to selected 1.37
indent

Revision 1.16 - (view) (download) (annotate) - [select for diffs]
Thu Sep 14 21:16:11 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Changes since 1.15: +3 -3 lines
Diff to previous 1.15 , to selected 1.37
cleanup

Revision 1.15 - (view) (download) (annotate) - [select for diffs]
Wed Sep 13 02:05:19 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Changes since 1.14: +908 -885 lines
Diff to previous 1.14 , to selected 1.37
preliminary uuid support

Revision 1.14 - (view) (download) (annotate) - [select for diffs]
Tue Sep 12 19:20:06 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Changes since 1.13: +7 -35 lines
Diff to previous 1.13 , to selected 1.37
- improve assign to prepend "..."
- make more use of assign
- implement op->debug_desc() and make some more use of it

Revision 1.13 - (view) (download) (annotate) - [select for diffs]
Mon Sep 11 20:28:37 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Changes since 1.12: +1 -1 lines
Diff to previous 1.12 , to selected 1.37
implement owner pointer using refcounted refptr templates

Revision 1.12 - (view) (download) (annotate) - [select for diffs]
Sun Sep 10 16:00:23 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Changes since 1.11: +1370 -925 lines
Diff to previous 1.11 , to selected 1.37
indent

Revision 1.11 - (view) (download) (annotate) - [select for diffs]
Fri Sep 8 17:14:07 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Changes since 1.10: +1 -0 lines
Diff to previous 1.10 , to selected 1.37
genaccess, take two

Revision 1.10 - (view) (download) (annotate) - [select for diffs]
Fri Sep 8 16:51:42 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Changes since 1.9: +1 -5 lines
Diff to previous 1.9 , to selected 1.37
generic accessors, take one

Revision 1.9 - (view) (download) (annotate) - [select for diffs]
Thu Sep 7 14:21:04 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Changes since 1.8: +18 -7 lines
Diff to previous 1.8 , to selected 1.37
stabilise object save order

Revision 1.8 - (view) (download) (annotate) - [select for diffs]
Thu Sep 7 09:37:12 2006 UTC (17 years, 9 months ago) by pippijn
Branch: MAIN
Changes since 1.7: +8 -2 lines
Diff to previous 1.7 , to selected 1.37
Cleaned up code a little.

Revision 1.7 - (view) (download) (annotate) - [select for diffs]
Mon Sep 4 17:34:50 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 , to selected 1.37
*** empty log message ***

Revision 1.6 - (view) (download) (annotate) - [select for diffs]
Mon Sep 4 17:27:13 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Changes since 1.5: +3 -1 lines
Diff to previous 1.5 , to selected 1.37
reality always is less simple than it appears

Revision 1.5 - (view) (download) (annotate) - [select for diffs]
Mon Sep 4 16:46:32 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Changes since 1.4: +14 -1 lines
Diff to previous 1.4 , to selected 1.37
major map loading speedups

Revision 1.4 - (view) (download) (annotate) - [select for diffs]
Mon Sep 4 15:51:24 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Changes since 1.3: +9 -0 lines
Diff to previous 1.3 , to selected 1.37
*** empty log message ***

Revision 1.3 - (view) (download) (annotate) - [select for diffs]
Mon Sep 4 13:55:54 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Changes since 1.2: +10 -5 lines
Diff to previous 1.2 , to selected 1.37
fix, uhm, bug. da.

Revision 1.2 - (view) (download) (annotate) - [select for diffs]
Mon Sep 4 11:07:59 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Changes since 1.1: +8 -4 lines
Diff to previous 1.1 , to selected 1.37
Changes...

- alternative shstr representation, saves code
- use glibs splice memory allocator (seems slower)
- use simpler memory/lifetime management for objects, no recycling

Revision 1.1 - (view) (download) (annotate) - [select for diffs]
Sun Sep 3 22:45:55 2006 UTC (17 years, 9 months ago) by root
Branch: MAIN
Diff to selected 1.37
string scanning (e.g. for patch) is not implemented ATM but should be easy
to add with an alternative constructor for object_thawer.

Rewrote flex scanner to be simpler, faster and more modularised.

Initial speedup: 16%

(ah well)

Convenience Links

Links to HEAD: (view) (download) (annotate) Links to rel-2_0: (view) (download) (annotate)

Compare Revisions

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.

  Diffs between and
  Type of Diff should be a