diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-08-11 02:54:10 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-08-11 02:54:10 +0200 |
| commit | 9527d079307454178fea3b2958e301875cecc15a (patch) | |
| tree | 333ed71036813c9cdec4c8e1de1e058b86275bca /src/sql/sqlite | |
| parent | 0820d6632b0ce5887c49d16929ac7903aa185fe4 (diff) | |
| parent | 8766149dc12d197205b1632ec6e9fc663de05990 (diff) | |
| download | manaserv-9527d079307454178fea3b2958e301875cecc15a.tar.gz manaserv-9527d079307454178fea3b2958e301875cecc15a.tar.xz manaserv-9527d079307454178fea3b2958e301875cecc15a.zip | |
Merge branch 'master' of git://gitorious.org/~bertram/mana/manaserv-equipment-fix into equipment-fix
Conflicts:
src/common/manaserv_protocol.h
Diffstat (limited to 'src/sql/sqlite')
| -rw-r--r-- | src/sql/sqlite/createTables.sql | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sql/sqlite/createTables.sql b/src/sql/sqlite/createTables.sql index b366606..1027b58 100644 --- a/src/sql/sqlite/createTables.sql +++ b/src/sql/sqlite/createTables.sql @@ -178,7 +178,8 @@ CREATE TABLE mana_char_equips id INTEGER PRIMARY KEY, owner_id INTEGER NOT NULL, slot_type INTEGER NOT NULL, - inventory_slot INTEGER NOT NULL, + item_id INTEGER NOT NULL, + item_instance INTEGER NOT NULL, -- FOREIGN KEY (owner_id) REFERENCES mana_characters(id) ); |