Freeciv - Patches: patch #1339, Unit type requirements [Gna!]

Freeciv - Patches: patch #1339, Unit type requirements

Group

Main
- Main
- View Members
- Search
Homepage
Download
Docs
- Browse
- Submit
- Edit
- Digest
- Export
- Search
Mailing Lists
Source Code
- Use Subversion
- Browse Sources Repository
Bugs
- Browse
- Reset to all open ones
- Submit
- Digest
- Export
- View Statistics
- Search
Tasks
- Browse
- Reset to all open ones
- Submit
- Digest
- Export
- View Statistics
- Search
Patches
- Browse
- Reset to all open ones
- Submit
- Digest
- Export
- View Statistics
- Search

Show feedback again

patch #1339: Unit type requirements

Submitted by:	pepeto <pepeto>
Submitted on:	Sat 17 Oct 2009 02:12:36 PM UTC

Category:	rulesets	Priority:	1 - Later
Status:	None	Privacy:	Public
Assigned to:	None	Open/Closed:	Open
Planned Release:

Add a New Comment (Rich Markup):

You are not logged in

Please log in, so followups can be emailed to you.

( Jump to the original submission)

Mon 14 May 2012 12:10:56 PM UTC, comment #12: Updated patch trunk rev.21272 Same gmake result... (file #15739)	J. M. Gorbach <gorb>
Tue 03 Apr 2012 08:37:42 AM UTC, comment #11: Updated patch trunk rev.21114 The patch is different. I don't delete nothing, but I only add new functions: server/ruleset.c, common/unittype.c, common/unittype.h, common/packets.def and client/packhand.c. gmake result: city.c: In function 'city_choose_build_default': city.c:1020:2: warning: comparison between pointer and integer [enabled by default] improvement.c: In function 'impr_provides_buildable_units': improvement.c:334:3: warning: comparison between pointer and integer [enabled by default] unittype.c: In function 'unit_type_by_translated_name': unittype.c:512:3: warning: comparison between pointer and integer [enabled by default] unittype.c: In function 'unit_type_by_rule_name': unittype.c:529:3: warning: comparison between pointer and integer [enabled by default] unittype.c: In function 'can_unit_happen': unittype.c:749:26: warning: passing argument 8 of 'are_reqs_active' from incompatible pointer type [enabled by default] requirements.h:95:6: note: expected 'const struct requirement_vector ' but argument is of type 'struct requirement_vector ' unittype.c:752:25: warning: passing argument 8 of 'are_reqs_active' from incompatible pointer type [enabled by default] requirements.h:95:6: note: expected 'const struct requirement_vector ' but argument is of type 'struct requirement_vector *' unittype.c: In function 'precalc_one': unittype.c:813:3: warning: comparison between pointer and integer [enabled by default] unittype.c:822:5: warning: comparison between pointer and integer [enabled by default] unittype.c: In function 'unit_types_init': unittype.c:982:5: warning: passing argument 1 of 'requirement_vector_init' from incompatible pointer type [enabled by default] ../utility/specvec.h:72:1: note: expected 'struct requirement_vector ' but argument is of type 'struct requirement_vector *' unittype.c:983:5: warning: passing argument 1 of 'requirement_vector_init' from incompatible pointer type [enabled by default] ../utility/specvec.h:72:1: note: expected 'struct requirement_vector ' but argument is of type 'struct requirement_vector *' unittype.c: In function 'unit_types_free': unittype.c:1004:3: warning: comparison between pointer and integer [enabled by default] unittype.c:1006:5: warning: passing argument 1 of 'requirement_vector_free' from incompatible pointer type [enabled by default] ../utility/specvec.h:117:1: note: expected 'struct requirement_vector ' but argument is of type 'struct requirement_vector *' unittype.c:1007:5: warning: passing argument 1 of 'requirement_vector_free' from incompatible pointer type [enabled by default] ../utility/specvec.h:117:1: note: expected 'struct requirement_vector ' but argument is of type 'struct requirement_vector *' aiair.c: In function 'dai_choose_attacker_air': aiair.c:444:3: warning: comparison between pointer and integer [enabled by default] aihunt.c: In function 'dai_hunter_guess_best': aihunt.c:85:3: warning: comparison between pointer and integer [enabled by default] aihunt.c: In function 'dai_hunter_missile_want': aihunt.c:165:3: warning: comparison between pointer and integer [enabled by default] aiparatrooper.c: In function 'dai_choose_paratrooper': aiparatrooper.c:340:3: warning: comparison between pointer and integer [enabled by default] aiunit.c: In function 'update_simple_ai_types': aiunit.c:2574:3: warning: comparison between pointer and integer [enabled by default] ruleset.c: In function 'load_unit_names': ruleset.c:1098:3: warning: comparison between pointer and integer [enabled by default] ruleset.c: In function 'load_ruleset_units': ruleset.c:1373:3: warning: comparison between pointer and integer [enabled by default] ruleset.c:1406:3: warning: comparison between pointer and integer [enabled by default] ruleset.c:1414:5: warning: passing argument 1 of 'requirement_vector_copy' from incompatible pointer type [enabled by default] ../utility/specvec.h:110:1: note: expected 'struct requirement_vector ' but argument is of type 'struct requirement_vector *' ruleset.c:1417:5: warning: passing argument 1 of 'requirement_vector_copy' from incompatible pointer type [enabled by default] ../utility/specvec.h:110:1: note: expected 'struct requirement_vector ' but argument is of type 'struct requirement_vector *' ruleset.c:1559:3: warning: comparison between pointer and integer [enabled by default] ruleset.c:1590:3: warning: comparison between pointer and integer [enabled by default] ruleset.c:1620:3: warning: comparison between pointer and integer [enabled by default] ruleset.c: In function 'load_ruleset_buildings': ruleset.c:1819:5: warning: comparison between pointer and integer [enabled by default] ruleset.c: In function 'send_ruleset_units': ruleset.c:3890:3: warning: comparison between pointer and integer [enabled by default] ruleset.c:3908:5: error: request for member 'size' in something not a structure or union ruleset.c:3908:5: error: request for member 'p' in something not a structure or union ruleset.c:3913:5: error: request for member 'size' in something not a structure or union ruleset.c:3913:5: error: request for member 'p' in something not a structure or union ruleset.c: In function 'sanity_check_ruleset_data': ruleset.c:4992:3: warning: comparison between pointer and integer [enabled by default] ruleset.c:5036:3: warning: comparison between pointer and integer [enabled by default] ruleset.c:5038:36: warning: passing argument 1 of 'sanity_check_req_nreq_vec' from incompatible pointer type [enabled by default] ruleset.c:4881:13: note: expected 'const struct requirement_vector ' but argument is of type 'struct requirement_vector *' ruleset.c:5038:36: warning: passing argument 2 of 'sanity_check_req_nreq_vec' from incompatible pointer type [enabled by default] ruleset.c:4881:13: note: expected 'const struct requirement_vector ' but argument is of type 'struct requirement_vector ' gmake[3]: * [ruleset.lo] Errore 1 gmake[3]: Leaving directory `/home/giorgio/freeciv/server' gmake[2]: * [all-recursive] Errore 1 gmake[2]: Leaving directory `/home/giorgio/freeciv/server' gmake[1]: * [all-recursive] Errore 1 gmake[1]: Leaving directory `/home/giorgio/freeciv' gmake: *** [all] Errore 2 (file #15505)	J. M. Gorbach <gorb>
Thu 02 Feb 2012 08:02:59 PM UTC, comment #10: Update new file diff. I'm at a standstill. (file #14973)	J. M. Gorbach <gorb>
Tue 10 Jan 2012 04:22:46 PM UTC, comment #9: Fixes common/unittype.h with Now remove and rewrite need_improvement, need_government and require_advance.	J. M. Gorbach <gorb>
Mon 09 Jan 2012 10:44:37 AM UTC, comment #8: Fixed client/gui-gtk-2.0/helpdlg.c Error in compilation: make[3]: Entering directory `/home/gorb/freeciv/common' Making all in aicore make[4]: Entering directory `/home/gorb/freeciv/common/aicore' CC aisupport.lo In file included from ../terrain.h:27:0, from ../requirements.h:24, from ../improvement.h:29, from ../city.h:28, from aisupport.c:24: ../unittype.h:232:29: error: field 'reqs' has incomplete type make[4]: * [aisupport.lo] error 1 make[4]: Leaving directory `/home/gorb/freeciv/common/aicore' make[3]: * [all-recursive] error 1 make[3]: Leaving directory `/home/gorb/freeciv/common' make[2]: * [all] error 2 make[2]: Leaving directory `/home/gorb/freeciv/common' make[1]: * [all-recursive] error 1 make[1]: Leaving directory `/home/gorb/freeciv' make: *** [all] error 2 unittype.h row 232 Any ideas? N.B. attached clientgui-gtk-2.0helpdlg.diff (file #14776)	J. M. Gorbach <gorb>
Sat 07 Jan 2012 11:16:59 PM UTC, comment #7: Error with new code.zip. Packtes.def contains many errors. Update new version. (file #14773)	J. M. Gorbach <gorb>
Sat 07 Jan 2012 11:00:22 PM UTC, comment #6: I found the problem. common/packets.def lost two strings: type UNIT_LIST = unit_list(int) type BUILDING_LIST = building_list(int) Now I update new Code.zip (file #14772)	J. M. Gorbach <gorb>
Sat 07 Jan 2012 05:09:20 PM UTC, comment #5: I read in ./generate_packets.py: * THIS FILE WAS GENERATED * * Script: common/generate_packets.py * * Input: common/packets.def * * DO NOT CHANGE THIS FILE * ****************************************************************************/ Now... probably the problem is in common/packets.def, but I don't find anything. In this file I have edit only 3 rows: Original TECH tech_requirement; UINT8 impr_requirement; GOVERNMENT gov_requirement; Edit UINT8 reqs_count; REQUIREMENT reqs[MAX_NUM_REQS:reqs_count]; Generate_packets.py generate packets.def or vice versa?	J. M. Gorbach <gorb>
Sat 07 Jan 2012 04:07:42 PM UTC, comment #4: 1. replace in the source code files in data.zip 2. replace in the source code files in code.zip 3. apply file #14713: patch.diff Try to compile and the result: libtool: link: ranlib .libs/libcivutility.a libtool: link: ( cd ".libs" && rm -f "libcivutility.la" && ln -s "../libcivutility.la" "libcivutility.la" ) gmake[3]: Leaving directory `/home/dude/src/freeciv-trunk/utility' gmake[2]: Leaving directory `/home/dude/src/freeciv-trunk/utility' Making all in common gmake[2]: Entering directory `/home/dude/src/freeciv-trunk/common' cd . && ./generate_packets.py Traceback (most recent call last): File "./generate_packets.py", line 1850, in <module> main() File "./generate_packets.py", line 1539, in main packets.append(Packet(str,types)) File "./generate_packets.py", line 1073, in __init__ self.fields=self.fields+parse_fields(i,types) File "./generate_packets.py", line 99, in parse_fields assert mo,str AssertionError: end gmake[2]: * [packets_generate] Error 1 gmake[2]: Leaving directory `/home/dude/src/freeciv-trunk/common' gmake[1]: * [all-recursive] Error 1 gmake[1]: Leaving directory `/home/dude/src/freeciv-trunk' gmake: *** [all] Error 2 Thanks akfaew/dude for the help with compilation	J. M. Gorbach <gorb>
Wed 14 Dec 2011 11:20:40 AM UTC, comment #3: Both patch are for TRUNK. Now I look for these files: ai/default/advmilitary.c ai/default/aitech.c ai/default/aidiplomat.c ai/default/aiparatrooper.c ai/default/aisettler.c ai/default/aiunit.c client/helpdata.c common/unittype.c All files contain string ''require_advance'', ''need_improvement'' and ''need_government''.	J. M. Gorbach <gorb>
Tue 13 Dec 2011 10:40:59 PM UTC, comment #2: Update - new patch (untested, maybe bugged and maybe instable) Remove ''require_advance'' from: client/gui-gtk-2.0/helpdlg.c client/gui-gtk-3.0/helpdlg.c client/gui-sdl/helpdlg.c client/gui-sdl/repodlgs.c client/gui-win32/helpdlg.c client/gui-xaw/helpdlg.c Problem with client/gui-sdl/diplomat_dialog.c: I don't know what to do with: /* get spy tech / i = advance_number(unit_type(game_unit_by_number(id))->require_advance); It's only string in all file with ''require_advance''. (file #14713*)	J. M. Gorbach <gorb>
Tue 13 Dec 2011 05:24:36 PM UTC, comment #1: Premise: I'am not a programmer. That being stated... Patch untested, probably bugged. The size is 677 kb because I'am on Windows and I used WinMerge - awful software -. Data.zip = cointains all units.ruleset replace with reqs = { "type", "name", "range" "Tech", "Pottery", "Player" } Code.zip = contains edited file (packets.def, packhand.c, reqtree.c, ruleset.c and unittype.c) If it's not clear something. (file #14710, file #14711, file #14712)	J. M. Gorbach <gorb>
Sat 17 Oct 2009 02:12:36 PM UTC, original submission: Remove the fields of unit types: require_advance need_improvement need_government Replace them by 'requirement_vector reqs'.	pepeto <pepeto>

(Note: upload size limit is set to 1024 kB, after insertion of the required escape characters.)

Attach File(s):


Comment:

Attached Files

file #15739: trunk-rev21272_requirement_vector.diff added by gorb (6kB - text/plain)

file #15505: trunk-rev21114_requirement_vector.diff added by gorb (6kB - text/x-patch)

file #14973: trunk_requirement_vector-02-2012.zip added by gorb (28kB - application/zip)

file #14776: clientgui-gtk-2.0helpdlg.diff added by gorb (3kB - text/x-patch)

file #14773: packets.def added by gorb (48kB - application/octet-stream)

file #14772: Code.zip added by gorb (82kB - application/zip)

file #14713: patch.diff added by gorb (13kB - application/octet-stream)

file #14710: unit_type_requirements.diff added by gorb (678kB - application/octet-stream)

file #14711: code.zip added by gorb (82kB - application/x-zip-compressed)

file #14712: data.zip added by gorb (60kB - application/x-zip-compressed)

Depends on the following items: None found

Items that depend on this one

[Metaticket] Generalize requirements (patch #1338, None)

unique units / flavour units for civs; specifically to allow scenario design (bug #14991, Duplicate)

Digest:
bug dependencies, patch dependencies.

Carbon-Copy List

-unavailable- added by jtn (Updated the item)

-unavailable- added by gorb (Updated the item)

-unavailable- added by dmarks (Updated the item)

-unavailable- added by pepeto (Submitted the item)

Do you think this task is very important?
If so, you can click here to add your encouragement to it.
This task has 0 encouragements so far.

Only logged-in users can vote.

Please enter the title of George Orwell's famous dystopian book (it's a date):

Follow 14 latest changes.

Date	Changed By	Updated Field	Previous Value	Replaced By
Mon 18 Jun 2012 01:15:35 AM UTC	jtn	Planned Release	2.4.0
Mon 14 May 2012 12:10:56 PM UTC	gorb	Attached File	-	Added trunk-rev21272_requirement_vector.diff, #15739
Tue 03 Apr 2012 08:37:42 AM UTC	gorb	Attached File	-	Added trunk-rev21114_requirement_vector.diff, #15505
Thu 02 Feb 2012 08:02:58 PM UTC	gorb	Attached File	-	Added trunk_requirement_vector-02-2012.zip, #14973
Mon 09 Jan 2012 10:44:37 AM UTC	gorb	Attached File	-	Added clientgui-gtk-2.0helpdlg.diff, #14776
Sat 07 Jan 2012 11:16:59 PM UTC	gorb	Attached File	-	Added packets.def, #14773
Sat 07 Jan 2012 11:00:22 PM UTC	gorb	Attached File	-	Added Code.zip, #14772
Tue 13 Dec 2011 10:40:59 PM UTC	gorb	Attached File	-	Added patch.diff, #14713
Tue 13 Dec 2011 05:24:36 PM UTC	gorb	Attached File	-	Added unit_type_requirements.diff, #14710
		Attached File	-	Added code.zip, #14711
		Attached File	-	Added data.zip, #14712
Wed 27 Oct 2010 01:54:26 PM UTC	pepeto	Planned Release	2.3.0	2.4.0
Sun 20 Dec 2009 09:41:17 AM UTC	dmarks	Planned Release		2.3.0
Sat 17 Oct 2009 02:31:36 PM UTC	pepeto	Dependencies	-	patch #1338 is dependent

Show feedback again